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

Re-enabled failing tests; fixed ctest_build output to be consistent in the error condition across different make programs so that these tests would pass.

This commit is contained in:
Zach Mullen 2009-09-21 13:40:40 -04:00
parent 43499b1ecb
commit e4293b4b38
2 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/CTest/cmCTestBuildHandler.cxx
View File

@ -445,11 +445,6 @@ int cmCTestBuildHandler::ProcessHandler()
this->EndBuild = this->CTest->CurrentTime(); this->EndBuild = this->CTest->CurrentTime();
this->EndBuildTime = cmSystemTools::GetTime(); this->EndBuildTime = cmSystemTools::GetTime();
double elapsed_build_time = cmSystemTools::GetTime() - elapsed_time_start; double elapsed_build_time = cmSystemTools::GetTime() - elapsed_time_start;
if (res != cmsysProcess_State_Exited || retVal )
{
cmCTestLog(this->CTest, ERROR_MESSAGE, "Error(s) when building project"
<< std::endl);
}
// Cleanups strings in the errors and warnings list. // Cleanups strings in the errors and warnings list.
t_ErrorsAndWarningsVector::iterator evit; t_ErrorsAndWarningsVector::iterator evit;
@ -502,6 +497,12 @@ int cmCTestBuildHandler::ProcessHandler()
} }
this->GenerateXMLFooter(xofs, elapsed_build_time); this->GenerateXMLFooter(xofs, elapsed_build_time);
if (res != cmsysProcess_State_Exited || retVal || this->TotalErrors > 0)
{
cmCTestLog(this->CTest, ERROR_MESSAGE, "Error(s) when building project"
<< std::endl);
}
// Display message about number of errors and warnings // Display message about number of errors and warnings
cmCTestLog(this->CTest, HANDLER_OUTPUT, " " << this->TotalErrors cmCTestLog(this->CTest, HANDLER_OUTPUT, " " << this->TotalErrors
<< (this->TotalErrors >= this->MaxErrors ? " or more" : "") << (this->TotalErrors >= this->MaxErrors ? " or more" : "")

34
Tests/CMakeLists.txt
View File

@ -1052,24 +1052,24 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel
"${CMake_SOURCE_DIR}/Tests/CTestTestFailure/testNoBuild.cmake.in" "${CMake_SOURCE_DIR}/Tests/CTestTestFailure/testNoBuild.cmake.in"
"${CMake_BINARY_DIR}/Tests/CTestTestFailure/testNoBuild.cmake" "${CMake_BINARY_DIR}/Tests/CTestTestFailure/testNoBuild.cmake"
@ONLY ESCAPE_QUOTES) @ONLY ESCAPE_QUOTES)
#ADD_TEST(CTestTestNoBuild ${CMAKE_CTEST_COMMAND} ADD_TEST(CTestTestNoBuild ${CMAKE_CTEST_COMMAND}
# -S "${CMake_BINARY_DIR}/Tests/CTestTestFailure/testNoBuild.cmake" -V -S "${CMake_BINARY_DIR}/Tests/CTestTestFailure/testNoBuild.cmake" -V
# --output-log "${CMake_BINARY_DIR}/Tests/CTestTestFailure/testOut1.log" --output-log "${CMake_BINARY_DIR}/Tests/CTestTestFailure/testOut1.log"
# ) )
#SET_TESTS_PROPERTIES(CTestTestNoBuild PROPERTIES SET_TESTS_PROPERTIES(CTestTestNoBuild PROPERTIES
# FAIL_REGULAR_EXPRESSION "Error" WILL_FAIL true) FAIL_REGULAR_EXPRESSION "Error" WILL_FAIL true)
#CONFIGURE_FILE( CONFIGURE_FILE(
# "${CMake_SOURCE_DIR}/Tests/CTestTestFailure/testNoExe.cmake.in" "${CMake_SOURCE_DIR}/Tests/CTestTestFailure/testNoExe.cmake.in"
# "${CMake_BINARY_DIR}/Tests/CTestTestFailure/testNoExe.cmake" "${CMake_BINARY_DIR}/Tests/CTestTestFailure/testNoExe.cmake"
# @ONLY ESCAPE_QUOTES) @ONLY ESCAPE_QUOTES)
# ADD_TEST(CTestTestNoExe ${CMAKE_CTEST_COMMAND} ADD_TEST(CTestTestNoExe ${CMAKE_CTEST_COMMAND}
# -S "${CMake_BINARY_DIR}/Tests/CTestTestFailure/testNoExe.cmake" -V -S "${CMake_BINARY_DIR}/Tests/CTestTestFailure/testNoExe.cmake" -V
# --output-log "${CMake_BINARY_DIR}/Tests/CTestTestFailure/testOut2.log" --output-log "${CMake_BINARY_DIR}/Tests/CTestTestFailure/testOut2.log"
# ) )
# SET_TESTS_PROPERTIES(CTestTestNoExe PROPERTIES #DEPENDS CTestTestNoBuild SET_TESTS_PROPERTIES(CTestTestNoExe PROPERTIES #DEPENDS CTestTestNoBuild
# PASS_REGULAR_EXPRESSION "Could not find executable" PASS_REGULAR_EXPRESSION "Could not find executable"
# FAIL_REGULAR_EXPRESSION "SegFault") FAIL_REGULAR_EXPRESSION "SegFault")
CONFIGURE_FILE( CONFIGURE_FILE(
"${CMake_SOURCE_DIR}/Tests/CTestTestCrash/test.cmake.in" "${CMake_SOURCE_DIR}/Tests/CTestTestCrash/test.cmake.in"