[Cmake-commits] CMake branch, next, updated. v3.7.2-2411-ga3faf12

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  a3faf127a169cad512f9d6c67adfa1d8cc781f11 (commit)
       via  5181f1f86a4d4c2ac09a540285c938fe2c2fa262 (commit)
      from  e715efbedea5ef980aee816f6a398ce8752e5877 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a3faf127a169cad512f9d6c67adfa1d8cc781f11
commit a3faf127a169cad512f9d6c67adfa1d8cc781f11
Merge: e715efb 5181f1f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 30 09:27:31 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 30 09:27:31 2017 -0500

    Merge topic 'topic-reproducible-build' into next
    
    5181f1f8 Tests: make tests pass with SOURCE_DATE_EPOCH set


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5181f1f86a4d4c2ac09a540285c938fe2c2fa262
commit 5181f1f86a4d4c2ac09a540285c938fe2c2fa262
Author:     Bernhard M. Wiedemann <bwiedemann at suse.de>
AuthorDate: Sun Jan 29 11:52:55 2017 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 30 09:25:44 2017 -0500

    Tests: make tests pass with SOURCE_DATE_EPOCH set
    
    Fix tests to account for commit 243aed52 (cmTimestamp: Support
    SOURCE_DATE_EPOCH to override current time, 2017-01-25).
    
    In openSUSE we are running the test-suite as part of the build and that
    failed in these two places when building everything with
    `SOURCE_DATE_EPOCH` set.

diff --git a/Tests/CMakeTests/File-TIMESTAMP-NotBogus.cmake b/Tests/CMakeTests/File-TIMESTAMP-NotBogus.cmake
index d0e5fe3..f1aa390 100644
--- a/Tests/CMakeTests/File-TIMESTAMP-NotBogus.cmake
+++ b/Tests/CMakeTests/File-TIMESTAMP-NotBogus.cmake
@@ -1,6 +1,7 @@
 set(STAMP_FILENAME "${CMAKE_CURRENT_BINARY_DIR}/FileTimestamp-Stamp")
 set(STAMP_FORMAT "%Y-%m-%d")
 
+unset(ENV{SOURCE_DATE_EPOCH})
 string(TIMESTAMP timestamp1 "${STAMP_FORMAT}")
 
 file(WRITE "${STAMP_FILENAME}" "foo")
diff --git a/Tests/CTestTestStopTime/GetDate.cmake b/Tests/CTestTestStopTime/GetDate.cmake
index 1f4cb24..46ab2fb 100644
--- a/Tests/CTestTestStopTime/GetDate.cmake
+++ b/Tests/CTestTestStopTime/GetDate.cmake
@@ -49,6 +49,7 @@ macro(GET_DATE)
   # 01/12/2006  08:55:12
   # mm/dd/YYYY HH:MM:SS
   #
+  unset(ENV{SOURCE_DATE_EPOCH})
   string(TIMESTAMP "${GD_PREFIX}OV" "%m/%d/%Y %H:%M:%S")
 
   if(${GD_PREFIX}VERBOSE)

-----------------------------------------------------------------------

Summary of changes:
 Tests/CMakeTests/File-TIMESTAMP-NotBogus.cmake |    1 +
 Tests/CTestTestStopTime/GetDate.cmake          |    1 +
 2 files changed, 2 insertions(+)


hooks/post-receive
-- 
CMake