diff options
| author | Brad King <brad.king@kitware.com> | 2015-03-17 14:14:49 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-03-17 14:14:49 (GMT) |
| commit | e9072d26c0d90a8ff521d46347e5d1b3555f8099 (patch) | |
| tree | cce59f257253caf1018476658a7ff1834914db12 /Source | |
| parent | 4fb9abc5629ee5c046292adc77b2583ffc15c230 (diff) | |
| parent | 874fdd914a646d25096c34b97caafe43e2a77748 (diff) | |
| download | CMake-e9072d26c0d90a8ff521d46347e5d1b3555f8099.zip CMake-e9072d26c0d90a8ff521d46347e5d1b3555f8099.tar.gz CMake-e9072d26c0d90a8ff521d46347e5d1b3555f8099.tar.bz2 | |
Merge topic 'output-ctest-env-vars'
874fdd91 CTest: Output test-specific env vars in verbose mode (#15446)
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CTest/cmCTestRunTest.cxx | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx index 03131fd..01a7884 100644 --- a/Source/CTest/cmCTestRunTest.cxx +++ b/Source/CTest/cmCTestRunTest.cxx @@ -536,11 +536,26 @@ void cmCTestRunTest::ComputeArguments() } this->TestResult.FullCommandLine = testCommand; + // Print the test command in verbose mode cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, std::endl << this->Index << ": " << (this->TestHandler->MemCheck?"MemCheck":"Test") << " command: " << testCommand << std::endl); + + // Print any test-specific env vars in verbose mode + if (this->TestProperties->Environment.size()) + { + cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, this->Index << ": " + << "Environment variables: " << std::endl); + } + for(std::vector<std::string>::const_iterator e = + this->TestProperties->Environment.begin(); + e != this->TestProperties->Environment.end(); ++e) + { + cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, this->Index << ": " << *e + << std::endl); + } } //---------------------------------------------------------------------- |