[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2569-gd3fe541

[Stephen Kelly]

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  d3fe541f15d7a104a6c92d9c2a895a1fc5736061 (commit)
       via  e4737bc31f21a72591f8b1d0c2a9028e5aeb4849 (commit)
      from  d8a9d2d94eb5373dec79bfb5f02b0c5413a23620 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d3fe541f15d7a104a6c92d9c2a895a1fc5736061
commit d3fe541f15d7a104a6c92d9c2a895a1fc5736061
Merge: d8a9d2d e4737bc
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Apr 25 16:13:10 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 25 16:13:10 2014 -0400

    Merge topic 'file-generate-if-different' into next
    
    e4737bc3 Fix test.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e4737bc31f21a72591f8b1d0c2a9028e5aeb4849
commit e4737bc31f21a72591f8b1d0c2a9028e5aeb4849
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Apr 25 22:08:15 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Apr 25 22:12:32 2014 +0200

    Fix test.

diff --git a/Tests/RunCMake/File_Generate/RunCMakeTest.cmake b/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
index 85f9ba3..dd1cfce 100644
--- a/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
+++ b/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
@@ -12,11 +12,14 @@ run_cmake(DebugEvaluate)
 set(timeformat "%Y%j%H%M%S")
 
 macro(prepare_CMP0053_test policyStatus)
+  file(REMOVE "${RunCMake_BINARY_DIR}/CMP0053-${policyStatus}-build/output_file.txt")
   set(RunCMake_TEST_FILE "${RunCMake_SOURCE_DIR}/CMP0053-${policyStatus}")
+  set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/CMP0053-${policyStatus}-build")
   run_cmake(CMP0053-${policyStatus}-prepare)
   unset(RunCMake_TEST_FILE)
+  unset(RunCMake_TEST_BINARY_DIR)
   file(TIMESTAMP "${RunCMake_BINARY_DIR}/CMP0053-${policyStatus}-build/output_file.txt" timestamp_${policyStatus} ${timeformat})
-  if(timestamp_${policyStatus} EQUAL 0)
+  if(NOT timestamp_${policyStatus})
     message(SEND_ERROR "Could not get timestamp for \"${RunCMake_BINARY_DIR}/CMP0053-${policyStatus}-build/output_file.txt\"")
   endif()
 endmacro()
@@ -25,11 +28,12 @@ prepare_CMP0053_test(OLD)
 prepare_CMP0053_test(NEW)
 prepare_CMP0053_test(WARN)
 
+execute_process(COMMAND ${CMAKE_COMMAND} -E sleep 1)
+
 macro(run_CMP0053_test policyStatus)
-  set(RunCMake_TEST_OPTIONS "-DCHECK_GENERATE_TIMESTAMP=timestamp_${policyStatus}")
   run_cmake(CMP0053-${policyStatus})
   file(TIMESTAMP "${RunCMake_BINARY_DIR}/CMP0053-${policyStatus}-build/output_file.txt" timestamp_${policyStatus}_after ${timeformat})
-  if(timestamp_${policyStatus}_after EQUAL 0)
+  if(NOT timestamp_${policyStatus}_after)
     message(SEND_ERROR "Could not get timestamp for \"${RunCMake_BINARY_DIR}/CMP0053-${policyStatus}-build/output_file.txt\"")
   endif()
 endmacro()

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

Summary of changes:
 Tests/RunCMake/File_Generate/RunCMakeTest.cmake |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake