summaryrefslogtreecommitdiffstats
path: root/Source/CTest/cmCTestScriptHandler.h
diff options
context:
space:
mode:
authorNils Gladitz <nilsgladitz@gmail.com>2013-11-01 20:55:45 (GMT)
committerNils Gladitz <nilsgladitz@gmail.com>2013-11-02 12:05:38 (GMT)
commit35fbc10079fcbce51f542347cf74c57e3164b85e (patch)
treef533229e8bc7222aa61735aebffac838ff5ef4b0 /Source/CTest/cmCTestScriptHandler.h
parent9d9f102f5371a19e45fff5034f97b2f9f6d523f9 (diff)
downloadCMake-35fbc10079fcbce51f542347cf74c57e3164b85e.zip
CMake-35fbc10079fcbce51f542347cf74c57e3164b85e.tar.gz
CMake-35fbc10079fcbce51f542347cf74c57e3164b85e.tar.bz2
CTest: more aggressive implementation of ctest_empty_binary_directory()
Make sure that CMakeCache.txt is the last file being removed since the binary directory may be left in a state that is no longer removable otherwise. Also retry removal a couple of times which makes this more robust on windows where file locks may temporarily prevent removal.
Diffstat (limited to 'Source/CTest/cmCTestScriptHandler.h')
-rw-r--r--Source/CTest/cmCTestScriptHandler.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/CTest/cmCTestScriptHandler.h b/Source/CTest/cmCTestScriptHandler.h
index 80d5831..44e9dd0 100644
--- a/Source/CTest/cmCTestScriptHandler.h
+++ b/Source/CTest/cmCTestScriptHandler.h
@@ -135,6 +135,9 @@ private:
// Add ctest command
void AddCTestCommand(cmCTestCommand* command);
+ // Try to remove the binary directory once
+ static bool TryToRemoveBinaryDirectoryOnce(const std::string& directoryPath);
+
std::vector<cmStdString> ConfigurationScripts;
std::vector<bool> ScriptProcessScope;