diff options
| author | David Cole <david.cole@kitware.com> | 2010-10-28 19:36:17 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-10-28 19:36:17 (GMT) |
| commit | 9bf662a92a8d0b6a215bc81cdbf61284f2d67694 (patch) | |
| tree | 857754f5484edbdcacbfaf3a4264cec8ef929fc4 /Source | |
| parent | e561a46c1a852516dcbb1d435a4b8c6f95f636c3 (diff) | |
| parent | 3f94c7cc395d3f20890a6c9a14aa2795a5a9ce87 (diff) | |
| download | CMake-9bf662a92a8d0b6a215bc81cdbf61284f2d67694.zip CMake-9bf662a92a8d0b6a215bc81cdbf61284f2d67694.tar.gz CMake-9bf662a92a8d0b6a215bc81cdbf61284f2d67694.tar.bz2 | |
Merge topic 'fix_ctest_working_dir'
3f94c7c When processing DartMeasurements use the tests working directory.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CTest/cmCTestRunTest.cxx | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx index 6570d0e..76ff23a 100644 --- a/Source/CTest/cmCTestRunTest.cxx +++ b/Source/CTest/cmCTestRunTest.cxx @@ -264,7 +264,17 @@ bool cmCTestRunTest::EndTest(size_t completed, size_t total, bool started) { *this->TestHandler->LogFile << "Test time = " << buf << std::endl; } + + // Set the working directory to the tests directory + std::string oldpath = cmSystemTools::GetCurrentWorkingDirectory(); + cmSystemTools::ChangeDirectory(this->TestProperties->Directory.c_str()); + this->DartProcessing(); + + // restore working directory + cmSystemTools::ChangeDirectory(oldpath.c_str()); + + // if this is doing MemCheck then all the output needs to be put into // Output since that is what is parsed by cmCTestMemCheckHandler if(!this->TestHandler->MemCheck && started) |