[Cmake-commits] CMake branch, next, updated. v3.2.2-2713-g85333e1

[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  85333e13fc6b2089d9540069d1a9f4bf216f6894 (commit)
       via  12b85b17911bbba871ffecf485878091b1be50b6 (commit)
       via  ee58e94d62e33a06625f09b6a89ff3bbdeaf510e (commit)
      from  472df2c2b26005bd9f74f26ddfbbf3a8eef0e366 (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=85333e13fc6b2089d9540069d1a9f4bf216f6894
commit 85333e13fc6b2089d9540069d1a9f4bf216f6894
Merge: 472df2c 12b85b1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu May 14 08:54:15 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 14 08:54:15 2015 -0400

    Merge topic 'FindSquish-sh-exit' into next
    
    12b85b17 FindSquish: Avoid bash-specific behavior in test script (#15568)
    ee58e94d CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=12b85b17911bbba871ffecf485878091b1be50b6
commit 12b85b17911bbba871ffecf485878091b1be50b6
Author:     Felix Geyer <debfx at ubuntu.com>
AuthorDate: Thu May 14 05:31:00 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu May 14 08:53:33 2015 -0400

    FindSquish: Avoid bash-specific behavior in test script (#15568)
    
    Fix Squish4RunTestCase.sh to be POSIX compliant by exiting with 255
    explicitly instead of depending on bash to translate -1 to 255.  This
    script is used by the SQUISH_V3_ADD_TEST and SQUISH_V4_ADD_TEST macros
    provided by FindSquish.

diff --git a/Modules/Squish4RunTestCase.sh b/Modules/Squish4RunTestCase.sh
index abd5deb..39a3907 100755
--- a/Modules/Squish4RunTestCase.sh
+++ b/Modules/Squish4RunTestCase.sh
@@ -11,11 +11,11 @@ SETTINGSGROUP=$7
 $SQUISHSERVER --stop > /dev/null 2>&1
 
 echo "Adding AUT... $SQUISHSERVER --settingsGroup $SETTINGSGROUP --config addAUT $AUT $AUTDIR"
-$SQUISHSERVER --settingsGroup "$SETTINGSGROUP" --config addAUT "$AUT" "$AUTDIR" || exit -1
+$SQUISHSERVER --settingsGroup "$SETTINGSGROUP" --config addAUT "$AUT" "$AUTDIR" || exit 255
 # sleep 1
 
 echo "Starting the squish server... $SQUISHSERVER --daemon"
-$SQUISHSERVER --daemon || exit -1
+$SQUISHSERVER --daemon || exit 255
 # sleep 2
 
 echo "Running the test case...$SQUISHRUNNER --settingsGroup $SETTINGSGROUP --testsuite $TESTSUITE --testcase $TESTCASE"

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

Summary of changes:
 Modules/Squish4RunTestCase.sh |    4 ++--
 Source/CMakeVersion.cmake     |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake