diff options
| author | Marco Poletti <poletti.marco@gmail.com> | 2015-12-06 20:16:34 +0000 |
|---|---|---|
| committer | Marco Poletti <poletti.marco@gmail.com> | 2015-12-06 20:16:34 +0000 |
| commit | 0d9741430f1edccc140adc942ddc50ed06d44b40 (patch) | |
| tree | 9fb7595efda6a2516bdf8db208fa71bd9fafea91 /tests/CMakeLists.txt | |
| parent | f55f3f8c30648d2533980ce33b635f0901809398 (diff) | |
| download | google-fruit-0d9741430f1edccc140adc942ddc50ed06d44b40.tar.gz | |
Set test timeouts using 'timeout' again, since the timeouts set by CMake don't seem to be enforced on OSX.
Diffstat (limited to 'tests/CMakeLists.txt')
| -rw-r--r-- | tests/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 477bdde..166ea20 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -229,7 +229,7 @@ endfunction(add_test_expected_to_pass) function(add_test_expected_to_fail_at_runtime NAME MESSAGE) add_test(NAME ${NAME} - COMMAND bash -c " + COMMAND timeout 30 bash -c " F=`mktemp` if $<TARGET_FILE:${NAME}-exec> &>\${F}; then cat \$F | fgrep error | head -n 1 @@ -251,7 +251,7 @@ endfunction(add_test_expected_to_fail_at_runtime) set(TEST_COMPILE_FLAGS "-std=c++11 -O2 -W -Wall -Werror -DFRUIT_EXTRA_DEBUG -D_GLIBCXX_DEBUG") function(add_test_expected_to_fail_at_compile_time NAME MESSAGE) - set(COMMAND " + set(COMMAND timeout 30 bash -c " F=`mktemp` if ${CMAKE_CXX_COMPILER} ${TEST_COMPILE_FLAGS} -c ${NAME}.cpp -I ../include -o - >/dev/null 2>\${F}; then cat \${F} |