diff options
Diffstat (limited to 'test/test-dbus-launch-x11.sh')
| -rwxr-xr-x | test/test-dbus-launch-x11.sh | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/test/test-dbus-launch-x11.sh b/test/test-dbus-launch-x11.sh index 8f049101..48c2718c 100755 --- a/test/test-dbus-launch-x11.sh +++ b/test/test-dbus-launch-x11.sh @@ -30,6 +30,7 @@ echo "# dbus-daemon binary: ${DBUS_TEST_DAEMON:=dbus-daemon}" echo "# dbus-launch binary: ${DBUS_TEST_DBUS_LAUNCH:=dbus-launch}" echo "# dbus-monitor binary: ${DBUS_TEST_DBUS_LAUNCH:=dbus-monitor}" 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" @@ -47,6 +48,16 @@ else launch_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 + if ! workdir="$(mktemp -d)"; then echo "1..0 # SKIP - mktemp -d doesn't work" exit 0 |