summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2011-09-22 13:50:40 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2013-10-21 12:37:45 +0100
commitdacf9d5d09b104469c1b30c6efd4107d03ce79bc (patch)
treea7f71ed8ae503b2dfbb02857a86fcda7a25bef7e
parent79d817e8c11f9dd45f83da30f864f31641e05ac0 (diff)
downloaddbus-glib-dacf9d5d09b104469c1b30c6efd4107d03ce79bc.tar.gz
interfaces test: don't call an undefined function on failure, just use set -e
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41129 Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
-rwxr-xr-xtest/interfaces/run-test.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/test/interfaces/run-test.sh b/test/interfaces/run-test.sh
index 71b27c1..62d2fde 100755
--- a/test/interfaces/run-test.sh
+++ b/test/interfaces/run-test.sh
@@ -16,6 +16,8 @@ if test -z "$DBUS_TEST_GLIB_IN_RUN_TEST"; then
exec $DBUS_TOP_SRCDIR/tools/run-with-tmp-session-bus.sh $SCRIPTNAME $MODE
fi
+set -e
+
for x in annotated-node nested-annotation; do
if ! test -f $srcdir/invalid-$x.xml; then
echo "invalid-$x.xml missing">&2
@@ -34,4 +36,4 @@ for x in annotated-node nested-annotation; do
done
echo "running test-client"
-${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/interfaces/test-client || die "test-client failed"
+${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/interfaces/test-client