summaryrefslogtreecommitdiffstats
path: root/Source/CTest/cmCTestMultiProcessHandler.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'Source/CTest/cmCTestMultiProcessHandler.cxx')
-rw-r--r--Source/CTest/cmCTestMultiProcessHandler.cxx15
1 files changed, 8 insertions, 7 deletions
diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx
index 336303a..a79f131 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.cxx
+++ b/Source/CTest/cmCTestMultiProcessHandler.cxx
@@ -43,8 +43,11 @@ cmCTestMultiProcessHandler::SetTests(TestMap& tests,
this->TestRunningMap[i->first] = false;
this->TestFinishMap[i->first] = false;
}
- this->ReadCostData();
- this->CreateTestCostList();
+ if(!this->CTest->GetShowOnly())
+ {
+ this->ReadCostData();
+ this->CreateTestCostList();
+ }
}
// Set the max number of tests that can be run at the same time.
@@ -102,6 +105,7 @@ void cmCTestMultiProcessHandler::StartTestProcess(int test)
this->RunningCount -= GetProcessorsUsed(test);
testRun->EndTest(this->Completed, this->Total, false);
this->Failed->push_back(this->Properties[test]->Name);
+ delete testRun;
}
cmSystemTools::ChangeDirectory(current_dir.c_str());
}
@@ -412,12 +416,9 @@ void cmCTestMultiProcessHandler::CheckResume()
fin.close();
}
}
- else
+ else if(cmSystemTools::FileExists(fname.c_str(), true))
{
- if(cmSystemTools::FileExists(fname.c_str(), true))
- {
- cmSystemTools::RemoveFile(fname.c_str());
- }
+ cmSystemTools::RemoveFile(fname.c_str());
}
}