summaryrefslogtreecommitdiffstats
path: root/Source/ctest.cxx
diff options
context:
space:
mode:
authorKen Martin <ken.martin@kitware.com>2001-09-11 19:17:40 (GMT)
committerKen Martin <ken.martin@kitware.com>2001-09-11 19:17:40 (GMT)
commitfaafcdddbf83e3efc96eb04fd80cce4c8514a5fa (patch)
tree8c872661bffb4c10377a69eb081743a92e1f2696 /Source/ctest.cxx
parent7e37a0cafb6aad056c022218fc7a243292e6b422 (diff)
downloadCMake-faafcdddbf83e3efc96eb04fd80cce4c8514a5fa.zip
CMake-faafcdddbf83e3efc96eb04fd80cce4c8514a5fa.tar.gz
CMake-faafcdddbf83e3efc96eb04fd80cce4c8514a5fa.tar.bz2
updated testing
Diffstat (limited to 'Source/ctest.cxx')
-rw-r--r--Source/ctest.cxx23
1 files changed, 20 insertions, 3 deletions
diff --git a/Source/ctest.cxx b/Source/ctest.cxx
index 36009e5..7d55229 100644
--- a/Source/ctest.cxx
+++ b/Source/ctest.cxx
@@ -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++;
}