dbus-marshal-validate: Check brackets in signature nest correctly

[platform/upstream/dbus.git] / test / test-dbus-launch-eval.sh

diff --git a/test/test-dbus-launch-eval.sh b/test/test-dbus-launch-eval.sh
index 7b464bf..cd96065 100755 (executable)
--- a/test/test-dbus-launch-eval.sh
+++ b/test/test-dbus-launch-eval.sh
@@ -25,10 +25,10 @@
 set -e
 
 export DBUS_DEBUG_OUTPUT=1
-export DBUS_USE_TEST_BINARY=1
 echo "# dbus-daemon binary: ${DBUS_TEST_DAEMON:=dbus-daemon}"
 echo "# dbus-launch binary: ${DBUS_TEST_DBUS_LAUNCH:=dbus-launch}"
 echo "# dbus-send binary: ${DBUS_TEST_DBUS_SEND:=dbus-send}"
+echo "# dbus-uuidgen binary: ${DBUS_TEST_DBUS_UUIDGEN:=dbus-uuidgen}"
 
 if test -n "$DBUS_TEST_DATA"; then
     echo "# test data: $DBUS_TEST_DATA"
@@ -42,6 +42,16 @@ else
     config="--sh-syntax"
 fi
 
+if ! "${DBUS_TEST_DBUS_UUIDGEN}" --get >/dev/null; then
+    if test -n "$DBUS_TEST_UNINSTALLED"; then
+        echo "1..0 # SKIP - Unable to test dbus-launch without a machine ID"
+        exit 0
+    else
+        echo "Bail out! dbus not correctly installed: no machine ID"
+        exit 1
+    fi
+fi
+
 echo "1..1"
 
 unset DBUS_SESSION_BUS_ADDRESS