diff options
| author | Brad King <brad.king@kitware.com> | 2024-04-18 12:27:55 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-04-18 12:28:05 (GMT) |
| commit | 0bb28c522b26dd0aee5722dcb7ee2d2f857add4c (patch) | |
| tree | 90bf5beb403ce8981135d88e9ab763191155b2e4 | |
| parent | 6b01aa6fed39feb05652b5b2cb60f2c796f687fb (diff) | |
| parent | 96dbf6c34a0df95cefb5577904586edce8586cdd (diff) | |
| download | CMake-0bb28c522b26dd0aee5722dcb7ee2d2f857add4c.zip CMake-0bb28c522b26dd0aee5722dcb7ee2d2f857add4c.tar.gz CMake-0bb28c522b26dd0aee5722dcb7ee2d2f857add4c.tar.bz2 | |
Merge topic 'invalid-ctest-arg-revisions'
96dbf6c34a ctest: Cleanup for invalid argument handling
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9440
| -rw-r--r-- | Source/cmCTest.cxx | 7 | ||||
| -rw-r--r-- | Tests/RunCMake/CTestCommandLine/invalid-ctest-argument-stderr.txt | 3 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index 29bf311..498fd6e 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -760,9 +760,7 @@ bool cmCTest::UpdateCTestConfiguration() } if (!this->GetCTestConfiguration("BuildDirectory").empty()) { this->Impl->BinaryDir = this->GetCTestConfiguration("BuildDirectory"); - if (this->Impl->TestDir.empty()) { - cmSystemTools::ChangeDirectory(this->Impl->BinaryDir); - } + cmSystemTools::ChangeDirectory(this->Impl->BinaryDir); } this->Impl->TimeOut = std::chrono::seconds(atoi(this->GetCTestConfiguration("TimeOut").c_str())); @@ -2830,7 +2828,8 @@ int cmCTest::Run(std::vector<std::string>& args, std::string* output) if (!validArg && cmHasLiteralPrefix(arg, "-") && !cmHasLiteralPrefix(arg, "--preset")) { - cmSystemTools::Error(cmStrCat("Invalid argument: ", arg)); + cmSystemTools::Error(cmStrCat("Unknown argument: ", arg)); + cmSystemTools::Error("Run 'ctest --help' for all supported options."); return 1; } } // the close of the for argument loop diff --git a/Tests/RunCMake/CTestCommandLine/invalid-ctest-argument-stderr.txt b/Tests/RunCMake/CTestCommandLine/invalid-ctest-argument-stderr.txt index 4de2e77..3304a26 100644 --- a/Tests/RunCMake/CTestCommandLine/invalid-ctest-argument-stderr.txt +++ b/Tests/RunCMake/CTestCommandLine/invalid-ctest-argument-stderr.txt @@ -1 +1,2 @@ -CMake Error: Invalid argument: --not-a-valid-ctest-argument +CMake Error: Unknown argument: --not-a-valid-ctest-argument +CMake Error: Run 'ctest --help' for all supported options. |