diff options
| author | Brad King <brad.king@kitware.com> | 2018-09-10 18:35:59 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-09-10 18:35:59 (GMT) |
| commit | 3eda5cdd939e0bae5241e2286e7524d552ab455c (patch) | |
| tree | 79790a57ef37e1a3bf145549ff96991d42b77f83 | |
| parent | 68f2b471df7687e37ab2a5808585aad76c7c3122 (diff) | |
| parent | 09f0325eaffb6b32b570e3339aa8b8332350b31d (diff) | |
| download | CMake-3eda5cdd939e0bae5241e2286e7524d552ab455c.zip CMake-3eda5cdd939e0bae5241e2286e7524d552ab455c.tar.gz CMake-3eda5cdd939e0bae5241e2286e7524d552ab455c.tar.bz2 | |
Merge branch 'fix-ctest_start-track' into release-3.12
Merge-request: !2366
| -rw-r--r-- | Source/cmCTest.cxx | 6 | ||||
| -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 |
4 files changed, 14 insertions, 3 deletions
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index d0e668d..bcb754a 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -478,11 +478,13 @@ int cmCTest::Initialize(const char* binary_dir, cmCTestStartCommand* command) tag.clear(); } std::string track; - if (cmSystemTools::GetLineFromStream(tfin, track)) { + if (cmSystemTools::GetLineFromStream(tfin, track) && + !this->Parts[PartStart] && !command) { this->SpecificTrack = track; } std::string model; - if (cmSystemTools::GetLineFromStream(tfin, model)) { + if (cmSystemTools::GetLineFromStream(tfin, model) && + !this->Parts[PartStart] && !command) { this->TestModel = GetTestModelFromString(model.c_str()); } tfin.close(); 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() |