From 6132d90bff1d066d993e790be8a2a21251a0c2f2 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Mon, 16 Sep 2013 13:47:19 +0100
Subject: [PATCH] When using dbus-launch for tests, fail hard if test binary is
 missing

We want to test the version-under-test, not the system version.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37849
---
 tools/dbus-launch.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/dbus-launch.c b/tools/dbus-launch.c
index 73e0438..e2fd323 100644
--- a/tools/dbus-launch.c
+++ b/tools/dbus-launch.c
@@ -1154,8 +1154,9 @@ main (int argc, char **argv)
                  NULL); 
 
           fprintf (stderr,
-                   "Failed to execute test message bus daemon %s: %s. Will try again with the system path.\n",
+                   "Failed to execute test message bus daemon %s: %s.\n",
                    TEST_BUS_BINARY, strerror (errno));
+          exit (1);
         }
  #endif /* DBUS_ENABLE_EMBEDDED_TESTS */
 
-- 
1.8.4.rc3