summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2016-01-25 15:06:18 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2016-01-25 15:06:18 +0000
commitdbeb65c6896b13f3e49768d56e17d98267e35e9a (patch)
tree4db05a69b6a6b8078bc63c823c85f39ea62d95df
parent6db53271b18a987a12cf0109f685646d4bc4aa7a (diff)
parent7eb34fc2cdb637974976ccaf3a9996059f09758f (diff)
downloaddbus-dbeb65c6896b13f3e49768d56e17d98267e35e9a.tar.gz
Merge branch 'dbus-1.10' into dbus-1.10-ci
-rwxr-xr-xtest/name-test/run-test.sh6
1 files changed, 2 insertions, 4 deletions
diff --git a/test/name-test/run-test.sh b/test/name-test/run-test.sh
index 1e257a16..8b9e7ad1 100755
--- a/test/name-test/run-test.sh
+++ b/test/name-test/run-test.sh
@@ -48,10 +48,8 @@ c_test () {
shift
e=0
echo "# running test $t"
- if ! "${DBUS_TOP_BUILDDIR}/libtool" --mode=execute $DEBUG "$DBUS_TOP_BUILDDIR/test/name-test/$t" "$@" >&2; then
- e=$?
- echo "# exit status $e"
- fi
+ "${DBUS_TOP_BUILDDIR}/libtool" --mode=execute $DEBUG "$DBUS_TOP_BUILDDIR/test/name-test/$t" "$@" >&2 || e=$?
+ echo "# exit status $e"
interpret_result "$e" "$t" "$@"
}