aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Benoit Jacob <jacob.benoit.1@gmail.com>2009-11-16 09:38:44 -0500
committerGravatar Benoit Jacob <jacob.benoit.1@gmail.com>2009-11-16 09:38:44 -0500
commite09768e3bc8ff60972cc7cbf49e4a12e2b1c9235 (patch)
treec157d9ebecf5f5ef769ba0a17818a66f380a2b78
parentf7e73f1bf900346676e84a597a146b11dd7ac5dc (diff)
handle make errors ---> exit, don't run ctest
-rwxr-xr-xscripts/check.in4
-rwxr-xr-xtest/buildtests.in2
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/check.in b/scripts/check.in
index 3aa9501bb..2a862fd80 100755
--- a/scripts/check.in
+++ b/scripts/check.in
@@ -8,7 +8,5 @@ then
exit 0
fi
-./buildtests $*
-
# TODO when ctest 2.8 comes out, honor the jobs parameter
-ctest -R $1 \ No newline at end of file
+./buildtests $* && ctest -R $1 \ No newline at end of file
diff --git a/test/buildtests.in b/test/buildtests.in
index 52cc66281..c24234930 100755
--- a/test/buildtests.in
+++ b/test/buildtests.in
@@ -13,9 +13,11 @@ targets_to_make=`echo "$TESTSLIST" | grep "$1" | sed s/^/test_/g | xargs echo`
if [ $# == 1 ]
then
make $targets_to_make
+ exit $?
fi
if [ $# == 2 ]
then
make -j $2 $targets_to_make
+ exit $?
fi