diff options
| author | Arnstein Ressem <aressem@gmail.com> | 2016-08-23 15:10:36 +0200 |
|---|---|---|
| committer | Vegard Sjonfjell <vegardsjo@gmail.com> | 2016-08-23 15:10:36 +0200 |
| commit | 55e5a91901109161186e05d3a6e959e06958bbba (patch) | |
| tree | f312bab2c60207ee305dbcfa047fcc4fa8fd2dc1 /vespamalloc | |
| parent | d337a29392fb752dc725e4aea5efa0cc0df5f17a (diff) | |
Aressem/cmake more out of source tests (#441)
* vespalib tests run out of source.
* staging_vespalib run tests out of source.
* fastos tests run out of source.
* Fixed storage tests out of source.
* Fixed some of the config tests.
* config* tests run out of source.
* document_* tests run out of source.
* documentapi_ tests run out of source.
* Fixed fsa out of source tests.
* Fix jrt_test out of source.
* More tests run out of source.
* Fix some slobrok and messagebus tests.
* More fixes for out of source tests.
* Done with first pass of regular tests out of source.
* Only use SOURCE_DIRECTORY in a limited set of places.
* Fix some remaining tests.
* Some cleanups.
* No need for extra slash.
Diffstat (limited to 'vespamalloc')
| -rw-r--r-- | vespamalloc/src/tests/doubledelete/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | vespamalloc/src/tests/overwrite/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | vespamalloc/src/tests/thread/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | vespamalloc/src/tests/thread/thread_test.sh | 4 |
4 files changed, 6 insertions, 5 deletions
diff --git a/vespamalloc/src/tests/doubledelete/CMakeLists.txt b/vespamalloc/src/tests/doubledelete/CMakeLists.txt index c687b7ab098..6d78198af24 100644 --- a/vespamalloc/src/tests/doubledelete/CMakeLists.txt +++ b/vespamalloc/src/tests/doubledelete/CMakeLists.txt @@ -4,7 +4,7 @@ vespa_add_executable(vespamalloc_doubledelete_test_app TEST doubledelete.cpp DEPENDS ) -vespa_add_test(NAME vespamalloc_doubledelete_test_app NO_VALGRIND COMMAND sh doubledelete_test.sh) +vespa_add_test(NAME vespamalloc_doubledelete_test_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/doubledelete_test.sh) vespa_add_executable(vespamalloc_expectsignal_app SOURCES expectsignal.cpp diff --git a/vespamalloc/src/tests/overwrite/CMakeLists.txt b/vespamalloc/src/tests/overwrite/CMakeLists.txt index 7777c930669..fe82fe0a01b 100644 --- a/vespamalloc/src/tests/overwrite/CMakeLists.txt +++ b/vespamalloc/src/tests/overwrite/CMakeLists.txt @@ -4,7 +4,8 @@ vespa_add_executable(vespamalloc_overwrite_test_app TEST overwrite.cpp DEPENDS ) -vespa_add_test(NAME vespamalloc_overwrite_test_app NO_VALGRIND COMMAND sh overwrite_test.sh) +vespa_add_test(NAME vespamalloc_overwrite_test_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/overwrite_test.sh) +file(COPY vespamalloc.conf DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) vespa_add_executable(vespamalloc_expectsignal-overwrite_app SOURCES expectsignal.cpp diff --git a/vespamalloc/src/tests/thread/CMakeLists.txt b/vespamalloc/src/tests/thread/CMakeLists.txt index e9bf1489347..61a60dfec04 100644 --- a/vespamalloc/src/tests/thread/CMakeLists.txt +++ b/vespamalloc/src/tests/thread/CMakeLists.txt @@ -3,7 +3,7 @@ vespa_add_executable(vespamalloc_thread_test_app TEST SOURCES thread.cpp ) -vespa_add_test(NAME vespamalloc_thread_test_app NO_VALGRIND COMMAND sh thread_test.sh) +vespa_add_test(NAME vespamalloc_thread_test_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/thread_test.sh) vespa_add_executable(vespamalloc_racemanythreads_test_app SOURCES racemanythreads.cpp diff --git a/vespamalloc/src/tests/thread/thread_test.sh b/vespamalloc/src/tests/thread/thread_test.sh index 3af29ad052e..c3b14834626 100755 --- a/vespamalloc/src/tests/thread/thread_test.sh +++ b/vespamalloc/src/tests/thread/thread_test.sh @@ -3,8 +3,8 @@ set -e echo "Trying to find limit for processes:" if ulimit -u; then - echo "Fixing limit to 31215" - ulimit -u 31215 + echo "Fixing limit to 31100" + ulimit -u 31100 elif [ "$RETRYEXEC" ]; then echo "Already tried to re-exec script, giving up." exit 1 |