diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2017-03-01 18:38:18 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-03-06 15:38:00 (GMT) |
| commit | 89891bcb9e226cc6216227634d0272adbc080c72 (patch) | |
| tree | 02f8dbb2872f9752fb7dc938dd8c4d01d015605c /Source | |
| parent | c3304fa510fa0dba380190cfb775be2fafcd8527 (diff) | |
| download | CMake-89891bcb9e226cc6216227634d0272adbc080c72.zip CMake-89891bcb9e226cc6216227634d0272adbc080c72.tar.gz CMake-89891bcb9e226cc6216227634d0272adbc080c72.tar.bz2 | |
cmCTest, cmCTestCoverageHandler: remove cwd dance
The working directory changes here didn't really accomplish anything.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CTest/cmCTestCoverageHandler.cxx | 5 | ||||
| -rw-r--r-- | Source/cmCTest.cxx | 2 |
2 files changed, 0 insertions, 7 deletions
diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx index 989c096..ead1c26 100644 --- a/Source/CTest/cmCTestCoverageHandler.cxx +++ b/Source/CTest/cmCTestCoverageHandler.cxx @@ -1646,11 +1646,7 @@ int cmCTestCoverageHandler::HandleTracePyCoverage( std::string testingDir = this->CTest->GetBinaryDir() + "/Testing"; std::string tempDir = testingDir + "/CoverageInfo"; - std::string currentDirectory = cmSystemTools::GetCurrentWorkingDirectory(); cmSystemTools::MakeDirectory(tempDir.c_str()); - cmSystemTools::ChangeDirectory(tempDir); - - cmSystemTools::ChangeDirectory(currentDirectory); std::vector<std::string>::iterator fileIt; int file_count = 0; @@ -1737,7 +1733,6 @@ int cmCTestCoverageHandler::HandleTracePyCoverage( } ++file_count; } - cmSystemTools::ChangeDirectory(currentDirectory); return file_count; } diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index 559275e..e6e50e9 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -1122,7 +1122,6 @@ int cmCTest::RunTest(std::vector<const char*> argv, std::string* output, if (log) { *log << "* Run internal CTest" << std::endl; } - std::string oldpath = cmSystemTools::GetCurrentWorkingDirectory(); CM_AUTO_PTR<cmSystemTools::SaveRestoreEnvironment> saveEnv; if (modifyEnv) { @@ -1137,7 +1136,6 @@ int cmCTest::RunTest(std::vector<const char*> argv, std::string* output, if (log && output) { *log << *output; } - cmSystemTools::ChangeDirectory(oldpath); if (output) { cmCTestLog(this, HANDLER_VERBOSE_OUTPUT, "Internal cmCTest object used to run test." << std::endl |