[Cmake-commits] CMake branch, next, updated. v3.2.1-1722-gac895eb

[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  ac895eb1956eb72844cb669341307de0a8256f37 (commit)
       via  4e107ff0b866b918959a9c7a0c792795ade4896e (commit)
      from  e9afa5e5c5e62c7a7936aab438bb5afd4463461a (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=ac895eb1956eb72844cb669341307de0a8256f37
commit ac895eb1956eb72844cb669341307de0a8256f37
Merge: e9afa5e 4e107ff
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 10 14:55:32 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 10 14:55:32 2015 -0400

    Merge topic 'move-command-line-tests' into next
    
    4e107ff0 fixup! Tests: Move more command line tests into RunCMake.CommandLine


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4e107ff0b866b918959a9c7a0c792795ade4896e
commit 4e107ff0b866b918959a9c7a0c792795ade4896e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 10 14:52:20 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 10 14:53:04 2015 -0400

    fixup! Tests: Move more command line tests into RunCMake.CommandLine

diff --git a/Tests/RunCMake/CommandLine/G_bad-arg-result.txt b/Tests/RunCMake/CommandLine/G_bad-arg-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/CommandLine/G_bad-arg-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/CommandLine/G_bad-arg-stderr.txt b/Tests/RunCMake/CommandLine/G_bad-arg-stderr.txt
new file mode 100644
index 0000000..511208f
--- /dev/null
+++ b/Tests/RunCMake/CommandLine/G_bad-arg-stderr.txt
@@ -0,0 +1 @@
+^CMake Error: Could not create named generator NoSuchGenerator$
diff --git a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
index 77f4fda..f047baf 100644
--- a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
@@ -13,6 +13,7 @@ run_cmake_command(E_rename-no-arg ${CMAKE_COMMAND} -E rename)
 run_cmake_command(E_touch_nocreate-no-arg ${CMAKE_COMMAND} -E touch_nocreate)
 
 run_cmake_command(G_no-arg ${CMAKE_COMMAND} -G)
+run_cmake_command(G_bad-arg ${CMAKE_COMMAND} -G NoSuchGenerator)
 run_cmake_command(P_no-arg ${CMAKE_COMMAND} -P)
 run_cmake_command(P_no-file ${CMAKE_COMMAND} -P nosuchscriptfile.cmake)
 

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

Summary of changes:
 .../CMP0004-NEW-result.txt => CommandLine/G_bad-arg-result.txt}       |    0
 Tests/RunCMake/CommandLine/G_bad-arg-stderr.txt                       |    1 +
 Tests/RunCMake/CommandLine/RunCMakeTest.cmake                         |    1 +
 3 files changed, 2 insertions(+)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CommandLine/G_bad-arg-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CommandLine/G_bad-arg-stderr.txt


hooks/post-receive
-- 
CMake