summaryrefslogtreecommitdiffstats
path: root/Source/CTest/cmCTestRunTest.cxx
diff options
context:
space:
mode:
authorRolf Eike Beer <eike@sf-mail.de>2013-08-07 20:25:48 (GMT)
committerRolf Eike Beer <eike@sf-mail.de>2013-08-07 20:25:48 (GMT)
commit6f9aaad150f769cd73df408514cf5dc42c020074 (patch)
tree3b4f2b157d40db6b8d6ea5af708e01c11cadb060 /Source/CTest/cmCTestRunTest.cxx
parent7c9f0c664f5782c09c686b8e51fe50245463914b (diff)
downloadCMake-6f9aaad150f769cd73df408514cf5dc42c020074.zip
CMake-6f9aaad150f769cd73df408514cf5dc42c020074.tar.gz
CMake-6f9aaad150f769cd73df408514cf5dc42c020074.tar.bz2
CTest: create one output file per memcheck (#14303)
The output file used for memory checker runs must be unique for every test run in parallel, so simply make them unique for every test run. Simply use the test index to avoid collisions.
Diffstat (limited to 'Source/CTest/cmCTestRunTest.cxx')
-rw-r--r--Source/CTest/cmCTestRunTest.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx
index ddd7e45..0e2fa41 100644
--- a/Source/CTest/cmCTestRunTest.cxx
+++ b/Source/CTest/cmCTestRunTest.cxx
@@ -389,13 +389,13 @@ void cmCTestRunTest::MemCheckPostProcess()
switch ( handler->MemoryTesterStyle )
{
case cmCTestMemCheckHandler::VALGRIND:
- handler->PostProcessValgrindTest(this->TestResult);
+ handler->PostProcessValgrindTest(this->TestResult, this->Index);
break;
case cmCTestMemCheckHandler::PURIFY:
- handler->PostProcessPurifyTest(this->TestResult);
+ handler->PostProcessPurifyTest(this->TestResult, this->Index);
break;
case cmCTestMemCheckHandler::BOUNDS_CHECKER:
- handler->PostProcessBoundsCheckerTest(this->TestResult);
+ handler->PostProcessBoundsCheckerTest(this->TestResult, this->Index);
break;
default:
break;
@@ -524,7 +524,7 @@ void cmCTestRunTest::ComputeArguments()
= cmSystemTools::ConvertToOutputPath(this->ActualCommand.c_str());
//Prepends memcheck args to our command string
- this->TestHandler->GenerateTestCommand(this->Arguments);
+ this->TestHandler->GenerateTestCommand(this->Arguments, this->Index);
for(std::vector<std::string>::iterator i = this->Arguments.begin();
i != this->Arguments.end(); ++i)
{