[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-325-gce12801

[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  ce1280163f2d9000376c863f8967c3e31529eba5 (commit)
       via  06cdab9593119137ab7139a1c9d410063770da1c (commit)
      from  294e70c79a1611c0a58e7d82158afa203d57288c (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=ce1280163f2d9000376c863f8967c3e31529eba5
commit ce1280163f2d9000376c863f8967c3e31529eba5
Merge: 294e70c 06cdab9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Nov 4 16:38:38 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 4 16:38:38 2014 -0500

    Merge topic 'file-GENERATE-permissions' into next
    
    06cdab95 Add tests.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=06cdab9593119137ab7139a1c9d410063770da1c
commit 06cdab9593119137ab7139a1c9d410063770da1c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jul 22 15:10:57 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Nov 4 22:38:07 2014 +0100

    Add tests.

diff --git a/Tests/RunCMake/File_Generate/CarryPermissions-result.txt b/Tests/RunCMake/File_Generate/CarryPermissions-result.txt
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/Tests/RunCMake/File_Generate/CarryPermissions-result.txt
@@ -0,0 +1 @@
+0
diff --git a/Tests/RunCMake/File_Generate/CarryPermissions-stderr.txt b/Tests/RunCMake/File_Generate/CarryPermissions-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/File_Generate/CarryPermissions-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/File_Generate/CarryPermissions.cmake b/Tests/RunCMake/File_Generate/CarryPermissions.cmake
new file mode 100644
index 0000000..a04334f
--- /dev/null
+++ b/Tests/RunCMake/File_Generate/CarryPermissions.cmake
@@ -0,0 +1,5 @@
+
+file(GENERATE
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/output_script.sh"
+  INPUT "${CMAKE_CURRENT_SOURCE_DIR}/input_script.sh"
+)
diff --git a/Tests/RunCMake/File_Generate/RunCMakeTest.cmake b/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
index dee0692..578df81 100644
--- a/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
+++ b/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
@@ -35,3 +35,21 @@ unset(RunCMake_TEST_NO_CLEAN)
 if (NOT timestamp_after STREQUAL timestamp)
   message(SEND_ERROR "WriteIfDifferent changed output file.")
 endif()
+
+if (UNIX AND EXISTS /bin/sh)
+  set(RunCMake_TEST_NO_CLEAN ON)
+  run_cmake(CarryPermissions)
+  execute_process(
+    COMMAND "${RunCMake_BINARY_DIR}/CarryPermissions-build/output_script.sh"
+    OUTPUT_VARIABLE script_output
+    RESULT_VARIABLE script_result
+    ERROR_VARIABLE script_error
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+  if (script_result)
+    message(SEND_ERROR "Generated script did not execute correctly: [${script_result}]\n${script_output}\n====\n${script_error}")
+  endif()
+  if (NOT script_output STREQUAL SUCCESS)
+    message(SEND_ERROR "Generated script did not execute correctly:\n${script_output}\n====\n${script_error}")
+  endif()
+endif()
diff --git a/Tests/RunCMake/File_Generate/input_script.sh b/Tests/RunCMake/File_Generate/input_script.sh
new file mode 100755
index 0000000..2cc0983
--- /dev/null
+++ b/Tests/RunCMake/File_Generate/input_script.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+echo "$<$<STREQUAL:foo,foo>:SUCCESS>"

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

Summary of changes:
 .../CarryPermissions-result.txt}                     |    0
 .../CarryPermissions-stderr.txt}                     |    0
 Tests/RunCMake/File_Generate/CarryPermissions.cmake  |    5 +++++
 Tests/RunCMake/File_Generate/RunCMakeTest.cmake      |   18 ++++++++++++++++++
 .../File_Generate/input_script.sh}                   |    3 ++-
 5 files changed, 25 insertions(+), 1 deletion(-)
 copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => File_Generate/CarryPermissions-result.txt} (100%)
 copy Tests/RunCMake/{CMP0022/CMP0022-NOWARN-exe-stderr.txt => File_Generate/CarryPermissions-stderr.txt} (100%)
 create mode 100644 Tests/RunCMake/File_Generate/CarryPermissions.cmake
 copy Tests/{OutOfBinary/CMakeLists.txt => RunCMake/File_Generate/input_script.sh} (61%)
 mode change 100644 => 100755


hooks/post-receive
-- 
CMake