kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: fix failing test when valgrind is on

Browse Source
This commit is contained in:
Bill Hoffman 2007-09-19 11:16:57 -04:00
parent 4710c7aef6
commit 797db515a0
4 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Source/CTest/cmCTestTestHandler.cxx
View File

@ -655,11 +655,11 @@ void cmCTestTestHandler::ProcessOneTest(cmCTestTestProperties *it,
cres.ExecutionTime = (double)(clock_finish - clock_start); cres.ExecutionTime = (double)(clock_finish - clock_start);
cres.FullCommandLine = testCommand; cres.FullCommandLine = testCommand;
std::string reason;
if ( !this->CTest->GetShowOnly() ) if ( !this->CTest->GetShowOnly() )
{ {
bool testFailed = false; bool testFailed = false;
std::vector<cmsys::RegularExpression>::iterator passIt; std::vector<std::pair<cmsys::RegularExpression,std::string> >::iterator passIt;
bool forceFail = false; bool forceFail = false;
if ( it->RequiredRegularExpressions.size() > 0 ) if ( it->RequiredRegularExpressions.size() > 0 )
{ {
@ -668,13 +668,17 @@ void cmCTestTestHandler::ProcessOneTest(cmCTestTestProperties *it,
passIt != it->RequiredRegularExpressions.end(); passIt != it->RequiredRegularExpressions.end();
++ passIt ) ++ passIt )
{ {
if ( passIt->find(output.c_str()) ) if ( passIt->first.find(output.c_str()) )
{ {
found = true; found = true;
} }
} }
if ( !found ) if ( !found )
{ {
reason = "Required regular expression not found.";
reason += "Regex=[";
reason += passIt->second;
reason += "]";
forceFail = true; forceFail = true;
} }
} }
@ -684,8 +688,12 @@ void cmCTestTestHandler::ProcessOneTest(cmCTestTestProperties *it,
passIt != it->ErrorRegularExpressions.end(); passIt != it->ErrorRegularExpressions.end();
++ passIt ) ++ passIt )
{ {
if ( passIt->find(output.c_str()) ) if ( passIt->first.find(output.c_str()) )
{ {
reason = "Error regular expression found in output.";
reason += " Regex=[";
reason += passIt->second;
reason += "]";
forceFail = true; forceFail = true;
} }
} }
@ -701,7 +709,7 @@ void cmCTestTestHandler::ProcessOneTest(cmCTestTestProperties *it,
cmCTestLog(this->CTest, HANDLER_OUTPUT, " - But it should fail!"); cmCTestLog(this->CTest, HANDLER_OUTPUT, " - But it should fail!");
cres.Status = cmCTestTestHandler::FAILED; cres.Status = cmCTestTestHandler::FAILED;
testFailed = true; testFailed = true;
} }
else else
{ {
cres.Status = cmCTestTestHandler::COMPLETED; cres.Status = cmCTestTestHandler::COMPLETED;
@ -754,7 +762,7 @@ void cmCTestTestHandler::ProcessOneTest(cmCTestTestProperties *it,
else else
{ {
// Force fail will also be here? // Force fail will also be here?
cmCTestLog(this->CTest, HANDLER_OUTPUT, "***Failed"); cmCTestLog(this->CTest, HANDLER_OUTPUT, "***Failed " << reason);
if ( it->WillFail ) if ( it->WillFail )
{ {
cres.Status = cmCTestTestHandler::COMPLETED; cres.Status = cmCTestTestHandler::COMPLETED;
@ -1729,7 +1737,9 @@ bool cmCTestTestHandler::SetTestsProperties(
for ( crit = lval.begin(); crit != lval.end(); ++ crit ) for ( crit = lval.begin(); crit != lval.end(); ++ crit )
{ {
rtit->ErrorRegularExpressions.push_back( rtit->ErrorRegularExpressions.push_back(
cmsys::RegularExpression(crit->c_str())); std::pair<cmsys::RegularExpression, std::string>(
cmsys::RegularExpression(crit->c_str()),
std::string(crit->c_str())));
} }
} }
if ( key == "MEASUREMENT" ) if ( key == "MEASUREMENT" )
@ -1754,7 +1764,9 @@ bool cmCTestTestHandler::SetTestsProperties(
for ( crit = lval.begin(); crit != lval.end(); ++ crit ) for ( crit = lval.begin(); crit != lval.end(); ++ crit )
{ {
rtit->RequiredRegularExpressions.push_back( rtit->RequiredRegularExpressions.push_back(
cmsys::RegularExpression(crit->c_str())); std::pair<cmsys::RegularExpression, std::string>(
cmsys::RegularExpression(crit->c_str()),
std::string(crit->c_str())));
} }
} }
} }

4
Source/CTest/cmCTestTestHandler.h
View File

@ -80,8 +80,8 @@ public:
cmStdString Name; cmStdString Name;
cmStdString Directory; cmStdString Directory;
std::vector<std::string> Args; std::vector<std::string> Args;
std::vector<cmsys::RegularExpression> ErrorRegularExpressions; std::vector<std::pair<cmsys::RegularExpression,std::string> > ErrorRegularExpressions;
std::vector<cmsys::RegularExpression> RequiredRegularExpressions; std::vector<std::pair<cmsys::RegularExpression,std::string> > RequiredRegularExpressions;
std::map<cmStdString, cmStdString> Measurements; std::map<cmStdString, cmStdString> Measurements;
bool IsInBasedOnREOptions; bool IsInBasedOnREOptions;
bool WillFail; bool WillFail;

2
Source/kwsys/CMakeLists.txt
View File

@ -950,7 +950,7 @@ IF(KWSYS_STANDALONE OR CMake_SOURCE_DIR)
# We expect test to fail # We expect test to fail
SET_TESTS_PROPERTIES(kwsys.testFail PROPERTIES WILL_FAIL ON) SET_TESTS_PROPERTIES(kwsys.testFail PROPERTIES WILL_FAIL ON)
GET_TEST_PROPERTY(kwsys.testFail WILL_FAIL wfv) GET_TEST_PROPERTY(kwsys.testFail WILL_FAIL wfv)
SET_TESTS_PROPERTIES(kwsys.testRegistry PROPERTIES FAIL_REGULAR_EXPRESSION "ERROR;FAIL;Test failed") SET_TESTS_PROPERTIES(kwsys.testRegistry PROPERTIES FAIL_REGULAR_EXPRESSION "ERROR_NOT_VALGRIND;FAIL;Test failed")
SET_TESTS_PROPERTIES(kwsys.testRegistry PROPERTIES PASS_REGULAR_EXPRESSION "Test passed") SET_TESTS_PROPERTIES(kwsys.testRegistry PROPERTIES PASS_REGULAR_EXPRESSION "Test passed")
SET_TESTS_PROPERTIES(kwsys.testFail PROPERTIES MEASUREMENT "Some Key=Some Value") SET_TESTS_PROPERTIES(kwsys.testFail PROPERTIES MEASUREMENT "Some Key=Some Value")
MESSAGE(STATUS "GET_TEST_PROPERTY returned: ${wfv}") MESSAGE(STATUS "GET_TEST_PROPERTY returned: ${wfv}")

2
Tests/CMakeLists.txt
View File

@ -640,7 +640,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel
CONFIGURE_FILE("${CMake_SOURCE_DIR}/Tests/CTestTest3/test.cmake.in" CONFIGURE_FILE("${CMake_SOURCE_DIR}/Tests/CTestTest3/test.cmake.in"
"${CMake_BINARY_DIR}/Tests/CTestTest3/test.cmake" @ONLY ESCAPE_QUOTES) "${CMake_BINARY_DIR}/Tests/CTestTest3/test.cmake" @ONLY ESCAPE_QUOTES)
ADD_TEST(CTestTest3 ${CMAKE_CTEST_COMMAND} ADD_TEST(CTestTest3 ${CMAKE_CTEST_COMMAND}
-S "${CMake_BINARY_DIR}/Tests/CTestTest3/test.cmake" -V -S "${CMake_BINARY_DIR}/Tests/CTestTest3/test.cmake" -VV
--output-log "${CMake_BINARY_DIR}/Tests/CTestTest3/testOutput.log" --output-log "${CMake_BINARY_DIR}/Tests/CTestTest3/testOutput.log"
) )
# these tests take a long time, make sure they have it # these tests take a long time, make sure they have it