summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-05-15 15:22:26 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-05-15 15:22:26 (GMT)
commit1911cb2173cec31fac05de826ed02c4c0a38bc50 (patch)
treee5adc4508ee32d96272fa76d3f1083c4fb95c455
parentf6a41a441408cb32fcc5fee1a758627cdf4f9031 (diff)
parent12b85b17911bbba871ffecf485878091b1be50b6 (diff)
downloadCMake-1911cb2173cec31fac05de826ed02c4c0a38bc50.zip
CMake-1911cb2173cec31fac05de826ed02c4c0a38bc50.tar.gz
CMake-1911cb2173cec31fac05de826ed02c4c0a38bc50.tar.bz2
Merge topic 'FindSquish-sh-exit'
12b85b17 FindSquish: Avoid bash-specific behavior in test script (#15568)
-rwxr-xr-xModules/Squish4RunTestCase.sh4
1 files changed, 2 insertions, 2 deletions
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"