diff options
| author | Brad King <brad.king@kitware.com> | 2020-07-28 12:22:20 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-07-28 12:24:34 (GMT) |
| commit | dde97681e9eabcb6aada1d5d2d90a9b34beddc0f (patch) | |
| tree | 4d66ae82f7813ffcea75fcfcb65352c15d967f47 /Source | |
| parent | 825e19b81f04acf4dc95b905c337656ce28c6848 (diff) | |
| parent | 5fc5f4d26ed0736f4023d1aa1de2aa24d4df15af (diff) | |
| download | CMake-dde97681e9eabcb6aada1d5d2d90a9b34beddc0f.zip CMake-dde97681e9eabcb6aada1d5d2d90a9b34beddc0f.tar.gz CMake-dde97681e9eabcb6aada1d5d2d90a9b34beddc0f.tar.bz2 | |
Merge topic 'revert-add_test-special-chars' into release-3.18
5fc5f4d26e add_test: Revert "Allow special characters in test name"
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5067
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmTestGenerator.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/cmTestGenerator.cxx b/Source/cmTestGenerator.cxx index e10a8e2..af91177 100644 --- a/Source/cmTestGenerator.cxx +++ b/Source/cmTestGenerator.cxx @@ -77,7 +77,7 @@ void cmTestGenerator::GenerateScriptForConfig(std::ostream& os, cmGeneratorExpression ge(this->Test->GetBacktrace()); // Start the test command. - os << indent << "add_test(\"" << this->Test->GetName() << "\" "; + os << indent << "add_test(" << this->Test->GetName() << " "; // Evaluate command line arguments std::vector<std::string> argv = @@ -127,8 +127,8 @@ void cmTestGenerator::GenerateScriptForConfig(std::ostream& os, os << ")\n"; // Output properties for the test. - os << indent << "set_tests_properties(\"" << this->Test->GetName() - << "\" PROPERTIES "; + os << indent << "set_tests_properties(" << this->Test->GetName() + << " PROPERTIES "; for (auto const& i : this->Test->GetProperties().GetList()) { os << " " << i.first << " " << cmOutputConverter::EscapeForCMake( @@ -140,8 +140,7 @@ void cmTestGenerator::GenerateScriptForConfig(std::ostream& os, void cmTestGenerator::GenerateScriptNoConfig(std::ostream& os, Indent indent) { - os << indent << "add_test(\"" << this->Test->GetName() - << "\" NOT_AVAILABLE)\n"; + os << indent << "add_test(" << this->Test->GetName() << " NOT_AVAILABLE)\n"; } bool cmTestGenerator::NeedsScriptNoConfig() const @@ -161,8 +160,9 @@ void cmTestGenerator::GenerateOldStyle(std::ostream& fout, Indent indent) std::string exe = command[0]; cmSystemTools::ConvertToUnixSlashes(exe); - fout << indent << "add_test(\"" << this->Test->GetName() << "\" \"" << exe - << "\""; + fout << indent; + fout << "add_test("; + fout << this->Test->GetName() << " \"" << exe << "\""; for (std::string const& arg : cmMakeRange(command).advance(1)) { // Just double-quote all arguments so they are re-parsed |