From a2fe175647718a562e41c84717b67917adbe584d Mon Sep 17 00:00:00 2001 From: Zach Mullen Date: Thu, 18 Mar 2010 10:28:10 -0400 Subject: [PATCH] More debugging of StopTime test --- Source/CTest/cmCTestRunTest.cxx | 2 ++ Tests/CTestTestStopTime/GetDate.cmake | 14 ++++++++++++++ Tests/CTestTestStopTime/test.cmake.in | 5 ++--- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx index 549de81a9..8e7b9cd90 100644 --- a/Source/CTest/cmCTestRunTest.cxx +++ b/Source/CTest/cmCTestRunTest.cxx @@ -545,6 +545,8 @@ double cmCTestRunTest::ResolveTimeout() this->CTest->GetStopTime().c_str(), timezone); + cmCTestLog(this->CTest, HANDLER_OUTPUT, "Computed stop time=" + << buf << std::endl); time_t stop_time = curl_getdate(buf, ¤t_time); if(stop_time == -1) { diff --git a/Tests/CTestTestStopTime/GetDate.cmake b/Tests/CTestTestStopTime/GetDate.cmake index 71d121311..b79330691 100644 --- a/Tests/CTestTestStopTime/GetDate.cmake +++ b/Tests/CTestTestStopTime/GetDate.cmake @@ -216,4 +216,18 @@ MACRO(ADD_SECONDS sec) math(EXPR new_hr "${${GD_PREFIX}HOUR} + 1") endwhile() math(EXPR new_hr "${new_hr} % 24") + + # Pad the H, M, S if needed + string(LENGTH ${new_sec} sec_len) + string(LENGTH ${new_min} min_len) + string(LENGTH ${new_hr} hr_len) + if(${sec_len} EQUAL 1) + set(new_sec "0${new_sec}") + endif() + if(${min_len} EQUAL 1) + set(new_min "0${new_min}") + endif() + if(${hr_len} EQUAL 1) + set(new_hr "0${new_hr}") + endif() ENDMACRO(ADD_SECONDS) diff --git a/Tests/CTestTestStopTime/test.cmake.in b/Tests/CTestTestStopTime/test.cmake.in index cf212cc58..0d664ad58 100644 --- a/Tests/CTestTestStopTime/test.cmake.in +++ b/Tests/CTestTestStopTime/test.cmake.in @@ -26,10 +26,9 @@ CTEST_BUILD(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res) GET_DATE() message("original time: ${${GD_PREFIX}HOUR}:${${GD_PREFIX}MINUTE}:${${GD_PREFIX}SECOND}") -ADD_SECONDS(15) +ADD_SECONDS(25) message("stop time: ${new_hr}:${new_min}:${new_sec}") CTEST_TEST(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res STOP_TIME "${new_hr}:${new_min}:${new_sec}") -GET_DATE() -message("finish time: ${${GD_PREFIX}HOUR}:${${GD_PREFIX}MINUTE}:${${GD_PREFIX}SECOND}") + #CTEST_SUBMIT()