diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2018-09-10 15:23:38 (GMT) |
|---|---|---|
| committer | Kyle Edwards <kyle.edwards@kitware.com> | 2018-09-10 18:31:21 (GMT) |
| commit | 09f0325eaffb6b32b570e3339aa8b8332350b31d (patch) | |
| tree | 5d4fa50fefca47dc5fe0f4d25b9752c93b316eaa /Tests | |
| parent | f478fa633daeb1432805821adddc40730ffd283d (diff) | |
| download | CMake-09f0325eaffb6b32b570e3339aa8b8332350b31d.zip CMake-09f0325eaffb6b32b570e3339aa8b8332350b31d.tar.gz CMake-09f0325eaffb6b32b570e3339aa8b8332350b31d.tar.bz2 | |
CTest: Fix regression in ctest_start()
The format for the TAG file was changed in 3.12, and the way it was
read caused a regression which changed how the track was decided. This
commit fixes the regression.
Fixes #18347.
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/ctest_start/NoAppendDifferentTrack-stdout.txt | 8 | ||||
| -rw-r--r-- | Tests/RunCMake/ctest_start/RunCMakeTest.cmake | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/ctest_start/test.cmake.in | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/Tests/RunCMake/ctest_start/NoAppendDifferentTrack-stdout.txt b/Tests/RunCMake/ctest_start/NoAppendDifferentTrack-stdout.txt new file mode 100644 index 0000000..4a6f1e9 --- /dev/null +++ b/Tests/RunCMake/ctest_start/NoAppendDifferentTrack-stdout.txt @@ -0,0 +1,8 @@ +Run dashboard with model Experimental + Source directory: .*/Tests/RunCMake/ctest_start/NoAppendDifferentTrack + Build directory: .*/Tests/RunCMake/ctest_start/NoAppendDifferentTrack-build + Track: ExperimentalDifferent + Reading ctest configuration file: .*/Tests/RunCMake/ctest_start/NoAppendDifferentTrack/CTestConfig.cmake + Site: test-site + Build name: test-build-name + Use ExperimentalDifferent tag: [0-9-]+ diff --git a/Tests/RunCMake/ctest_start/RunCMakeTest.cmake b/Tests/RunCMake/ctest_start/RunCMakeTest.cmake index 2e8aa75..9b57b1b 100644 --- a/Tests/RunCMake/ctest_start/RunCMakeTest.cmake +++ b/Tests/RunCMake/ctest_start/RunCMakeTest.cmake @@ -30,6 +30,7 @@ run_ctest_start(AppendSameModel Continuous APPEND) run_ctest_start(AppendDifferentModel Experimental APPEND) run_ctest_start(AppendNoModel APPEND) run_ctest_start(AppendDifferentTrack TRACK ExperimentalDifferent APPEND) +run_ctest_start(NoAppendDifferentTrack Experimental TRACK ExperimentalDifferent) run_ctest_start(AppendNoMatchingTrack Continuous APPEND) run_ctest_start(AppendOldContinuous Continuous APPEND) run_ctest_start(AppendOldNoModel APPEND) diff --git a/Tests/RunCMake/ctest_start/test.cmake.in b/Tests/RunCMake/ctest_start/test.cmake.in index 172baf7..8cd3cff 100644 --- a/Tests/RunCMake/ctest_start/test.cmake.in +++ b/Tests/RunCMake/ctest_start/test.cmake.in @@ -14,7 +14,7 @@ function(setup_tests) ctest_start(${ctest_start_args}) endfunction() -if("@CASE_NAME@" MATCHES "^Append") +if("@CASE_NAME@" MATCHES "^(No)?Append") if("@CASE_NAME@" MATCHES "^AppendNoMatchingTrack$") file(WRITE "${CTEST_BINARY_DIRECTORY}/Testing/TAG" "19551112-2204\nSomeWeirdTrackName\n") else() |