diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2020-08-11 14:03:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-11 14:03:30 +0200 |
| commit | eea551b770fb788c63430c2e459987fedd054220 (patch) | |
| tree | fe955052fd39e9573f2f33c146914ebb221584be | |
| parent | fcaac7baa0674d1cc71ee72e417671127ff3081f (diff) | |
| parent | 5e08e4ff15fa345af33a870826284a72b8ed9e53 (diff) | |
Merge pull request #3010 from Holzhaus/ctest-timeout
CMake: Increase CTest timeout
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | appveyor.yml | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index e8949e621c..230b9deef5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -92,7 +92,7 @@ jobs: - cpack -G DEB script: # Run tests and benchmarks - - ctest + - ctest --timeout 45 - cmake --build . --target benchmark - name: OSX/clang/SCons build @@ -198,7 +198,7 @@ jobs: - cpack -G DragNDrop script: # Run tests and benchmarks - - ctest + - ctest --timeout 45 - cmake --build . --target benchmark before_cache: # Avoid indefinite cache growth diff --git a/CMakeLists.txt b/CMakeLists.txt index d142d0b698..098b91d2e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1336,7 +1336,6 @@ gtest_add_tests( WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" TEST_LIST testsuite ) -set_tests_properties(${testsuite} PROPERTIES TIMEOUT 30) # Benchmarking add_custom_target(mixxx-benchmark diff --git a/appveyor.yml b/appveyor.yml index d931a30ce8..50d7569610 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -132,7 +132,7 @@ for: test_script: - export CTEST_OUTPUT_ON_FAILURE=1 - export QT_QPA_PLATFORM=offscreen - - ctest -T test --no-compress-output + - ctest -T test --no-compress-output --timeout 45 - cmake --build . --target benchmark after_test: @@ -268,7 +268,7 @@ for: # Calling mixxx-test under bash to have standard output and use stdbuf to # unbuffer standard & error output - set CTEST_OUTPUT_ON_FAILURE=1 - - ctest -C "Release" -T test --no-compress-output + - ctest -C "Release" -T test --no-compress-output --timeout 45 - cmake --build . --target benchmark after_test: |