diff options
author | Brad King <brad.king@kitware.com> | 2016-11-11 15:44:24 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-11-11 15:44:24 (GMT) |
commit | 8b33507aba37f7aa8dc1c0d961ba49ef10679449 (patch) | |
tree | 31eddd100d85ee127b53e4cf47c23c83578d0863 /Tests | |
parent | a0b159685ea4383255e46de5456d6a9204457c1f (diff) | |
parent | d3633731ab423b0627f86f94e6ff5fb932bbe76e (diff) | |
download | CMake-8b33507aba37f7aa8dc1c0d961ba49ef10679449.zip CMake-8b33507aba37f7aa8dc1c0d961ba49ef10679449.tar.gz CMake-8b33507aba37f7aa8dc1c0d961ba49ef10679449.tar.bz2 |
Merge topic 'cdash_version_check'
d3633731 Do not query CDash for version
f725b20b Update tests that expect uncompressed output
Diffstat (limited to 'Tests')
-rw-r--r-- | Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake | 1 | ||||
-rw-r--r-- | Tests/RunCMake/RunCTest.cmake | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake index 2bc3693..e936dab 100644 --- a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake +++ b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake @@ -135,6 +135,7 @@ function(run_TestOutputSize) ") run_cmake_command(TestOutputSize ${CMAKE_CTEST_COMMAND} -M Experimental -T Test + --no-compress-output --test-output-size-passed 10 --test-output-size-failed 12 ) diff --git a/Tests/RunCMake/RunCTest.cmake b/Tests/RunCMake/RunCTest.cmake index e94432b..89e16ee 100644 --- a/Tests/RunCMake/RunCTest.cmake +++ b/Tests/RunCMake/RunCTest.cmake @@ -12,6 +12,7 @@ function(run_ctest CASE_NAME) -S ${RunCMake_BINARY_DIR}/${CASE_NAME}/test.cmake -V --output-log ${RunCMake_BINARY_DIR}/${CASE_NAME}-build/testOutput.log + --no-compress-output ${ARGN} ) endfunction() |