Skip to content
Snippets Groups Projects
Commit faafcddd authored by Ken Martin's avatar Ken Martin
Browse files

updated testing

parent 7e37a0ca
No related branches found
No related tags found
No related merge requests found
......@@ -105,6 +105,7 @@ void ctest::ProcessDirectory(int &passed, int &failed)
std::string name;
std::vector<std::string> args;
cmRegularExpression var(this->m_RegExp.c_str());
cmRegularExpression dartStuff("([\t\n ]*<DartMeasurement.*/DartMeasurement[a-zA-Z]*>[\t ]*[\n]*)");
while ( fin )
{
......@@ -153,14 +154,22 @@ void ctest::ProcessDirectory(int &passed, int &failed)
*/
std::string output;
int retVal;
if (!cmSystemTools::RunCommand(testCommand.c_str(), output,
retVal, false) || retVal != 0)
{
fprintf(stderr,"***Failed\n");
if (output != "")
{
std::cerr << output.c_str() << "\n";
if (dartStuff.find(output.c_str()))
{
cmSystemTools::ReplaceString(output,
dartStuff.match(1).c_str(),"");
}
if (output != "")
{
std::cerr << output.c_str() << "\n";
}
}
failed++;
}
......@@ -169,7 +178,15 @@ void ctest::ProcessDirectory(int &passed, int &failed)
fprintf(stderr," Passed\n");
if (output != "")
{
std::cerr << output.c_str() << "\n";
if (dartStuff.find(output.c_str()))
{
cmSystemTools::ReplaceString(output,
dartStuff.match(1).c_str(),"");
}
if (output != "")
{
std::cerr << output.c_str() << "\n";
}
}
passed++;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment