diff options
| author | Brad King <brad.king@kitware.com> | 2018-02-26 15:36:26 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-02-26 15:36:26 (GMT) |
| commit | be9731965e9a41fc58f73b8f243e52fd38678f06 (patch) | |
| tree | e54440b9364fe1c11461eb67314f7ece99738655 | |
| parent | 72a85d9f0bbfc69c53dfd5831699d6ff46772ccd (diff) | |
| parent | e1cd936c62cdcd8a2031e899238310a1ec12196d (diff) | |
| download | CMake-be9731965e9a41fc58f73b8f243e52fd38678f06.zip CMake-be9731965e9a41fc58f73b8f243e52fd38678f06.tar.gz CMake-be9731965e9a41fc58f73b8f243e52fd38678f06.tar.bz2 | |
Merge branch 'unixtimefix' into release-3.11
Merge-request: !1800
| -rw-r--r-- | Tests/CMakeTests/String-TIMESTAMP-UnixTime.cmake | 6 | ||||
| -rw-r--r-- | Tests/CMakeTests/StringTest.cmake.in | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Tests/CMakeTests/String-TIMESTAMP-UnixTime.cmake b/Tests/CMakeTests/String-TIMESTAMP-UnixTime.cmake index a93e7f5..43c9384 100644 --- a/Tests/CMakeTests/String-TIMESTAMP-UnixTime.cmake +++ b/Tests/CMakeTests/String-TIMESTAMP-UnixTime.cmake @@ -11,12 +11,12 @@ string(TIMESTAMP days "%j" UTC) # see if we are somewhere in the right region. math(EXPR years_since_epoch "${year} - 1970") -math(EXPR lower_bound "((${years_since_epoch} * 365) + ${days}) * 86400") +math(EXPR lower_bound "((${years_since_epoch} * 365) + ${days} - 1) * 86400") math(EXPR upper_bound "((${years_since_epoch} * 366) + ${days}) * 86400") -if(unix_time GREATER lower_bound AND unix_time LESS upper_bound) +if(unix_time GREATER_EQUAL lower_bound AND unix_time LESS upper_bound) message("~${unix_time}~") else() - message(FATAL_ERROR "${timestamp} unix time not in expected range [${lower_bound}, ${upper_bound}]") + message(FATAL_ERROR "${timestamp} unix time not in expected range [${lower_bound}, ${upper_bound})") endif() diff --git a/Tests/CMakeTests/StringTest.cmake.in b/Tests/CMakeTests/StringTest.cmake.in index 83655da..566f4b1 100644 --- a/Tests/CMakeTests/StringTest.cmake.in +++ b/Tests/CMakeTests/StringTest.cmake.in @@ -47,7 +47,7 @@ set(TIMESTAMP-AllSpecifiers-STDERR "~[0-9]+(;[0-9]+)*~") set(TIMESTAMP-MonthWeekNames-RESULT 0) set(TIMESTAMP-MonthWeekNames-STDERR "~[^%]+;[^%]+~") set(TIMESTAMP-UnixTime-RESULT 0) -set(TIMESTAMP-UnixTime-STDERR "~[1-9][0-9]+~") +set(TIMESTAMP-UnixTime-STDERR "~[0-9]+~") include("@CMAKE_CURRENT_SOURCE_DIR@/CheckCMakeTest.cmake") check_cmake_test(String |