From: Simon McVittie <smcv@debian.org>
Date: Tue, 24 Nov 2015 01:19:27 +0000 (+0000)
Subject: embedded tests: accept and ignore --tap argument
X-Git-Tag: dbus-1.11.0~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b21093478a7b4240d123c1946cb33eb162bb268a;p=thirdparty%2Fdbus.git

embedded tests: accept and ignore --tap argument

This makes them semi-command-line-compatible with a way we can
invoke the GLib-based tests to get more useful debug logs.

These tests still do not actually produce TAP output yet; I tried
implementing that, but it requires changing a lot of noise on stdout
to come out of stderr, and there was something weird going on with
subprocesses restarting the test numbering which will need further
investigation before making that change.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=93194
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
---

diff --git a/bus/test-launch-helper.c b/bus/test-launch-helper.c
index e9ba412ac..c58d06ebc 100644
--- a/bus/test-launch-helper.c
+++ b/bus/test-launch-helper.c
@@ -102,7 +102,7 @@ main (int argc, char **argv)
   const char *dir;
   DBusString config_file;
 
-  if (argc > 1)
+  if (argc > 1 && strcmp (argv[1], "--tap") != 0)
     dir = argv[1];
   else
     dir = _dbus_getenv ("DBUS_TEST_DATA");
diff --git a/bus/test-main.c b/bus/test-main.c
index 788574fe1..faa639556 100644
--- a/bus/test-main.c
+++ b/bus/test-main.c
@@ -95,7 +95,7 @@ main (int argc, char **argv)
 
   progname = argv[0];
 
-  if (argc > 1)
+  if (argc > 1 && strcmp (argv[1], "--tap") != 0)
     dir = argv[1];
   else
     dir = _dbus_getenv ("DBUS_TEST_DATA");
diff --git a/bus/test-system.c b/bus/test-system.c
index 5f02d0ab4..2d7848c7e 100644
--- a/bus/test-system.c
+++ b/bus/test-system.c
@@ -73,7 +73,7 @@ main (int argc, char **argv)
 
   progname = argv[0];
 
-  if (argc > 1)
+  if (argc > 1 && strcmp (argv[1], "--tap") != 0)
     dir = argv[1];
   else
     dir = _dbus_getenv ("DBUS_TEST_DATA");
diff --git a/dbus/dbus-test-main.c b/dbus/dbus-test-main.c
index 9a80f853b..08e402b9b 100644
--- a/dbus/dbus-test-main.c
+++ b/dbus/dbus-test-main.c
@@ -51,7 +51,7 @@ main (int    argc,
   setlocale(LC_ALL, "");
 #endif
   
-  if (argc > 1)
+  if (argc > 1 && strcmp (argv[1], "--tap") != 0)
     test_data_dir = argv[1];
   else
     test_data_dir = NULL;