aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsrc/paludis/upgrade_TEST14
-rwxr-xr-xtest/run_test.sh5
2 files changed, 11 insertions, 8 deletions
diff --git a/src/paludis/upgrade_TEST b/src/paludis/upgrade_TEST
index 48b315fe3..9bccff1c1 100755
--- a/src/paludis/upgrade_TEST
+++ b/src/paludis/upgrade_TEST
@@ -3,15 +3,15 @@
PALUDIS_HOME=./upgrade_TEST_dir/config/ \
./paludis --config-suffix upgrade-test --install =test-category/target-1 || exit 1
-./upgrade_TEST_dir/root/usr/bin/testbin | grep testbin-1 >/dev/null || exit 1
-./upgrade_TEST_dir/root/usr/bin/testbin1 | grep testbin1 >/dev/null || exit 1
-./upgrade_TEST_dir/root/usr/bin/testbin2 && exit 1
+./upgrade_TEST_dir/root/usr/bin/testbin | grep testbin-1 >/dev/null || exit 2
+./upgrade_TEST_dir/root/usr/bin/testbin1 | grep testbin1 >/dev/null || exit 3
+./upgrade_TEST_dir/root/usr/bin/testbin2 && exit 4
PALUDIS_HOME=./upgrade_TEST_dir/config/ \
- ./paludis --config-suffix upgrade-test --install target || exit 1
+ ./paludis --config-suffix upgrade-test --install target || exit 5
-./upgrade_TEST_dir/root/usr/bin/testbin | grep testbin-2 >/dev/null || exit 1
-./upgrade_TEST_dir/root/usr/bin/testbin1 && exit 1
-./upgrade_TEST_dir/root/usr/bin/testbin2 | grep testbin2 >/dev/null || exit 1
+./upgrade_TEST_dir/root/usr/bin/testbin | grep testbin-2 >/dev/null || exit 6
+./upgrade_TEST_dir/root/usr/bin/testbin1 && exit 7
+./upgrade_TEST_dir/root/usr/bin/testbin2 | grep testbin2 >/dev/null || exit 8
diff --git a/test/run_test.sh b/test/run_test.sh
index 6f1a68b5c..4cdeedf50 100755
--- a/test/run_test.sh
+++ b/test/run_test.sh
@@ -22,7 +22,10 @@ if test -f "$TEST_SCRIPT_DIR""${testname}"_"setup.sh" ; then
fi
echo ">>> test ${testname}"
-if ! ${@} ; then
+${@}
+code=$?
+if [[ 0 != ${code} ]] ; then
+ echo ">>> test ${testname} returned ${code}"
if test -f "$TEST_SCRIPT_DIR""${testname}"_"cleanup.sh" ; then
echo ">>> cleanup for test ${testname}"
"$TEST_SCRIPT_DIR""${testname}"_"cleanup.sh"