From: Simon McVittie <smcv@collabora.com>
Date: Tue, 14 Nov 2017 15:17:32 +0000 (+0000)
Subject: Do not export dbus_internal_do_not_use_run_tests if unused
X-Git-Tag: dbus-1.13.0~104
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fb9e8e4e0ce24b1fa65e157739826773b5d3f05d;p=thirdparty%2Fdbus.git

Do not export dbus_internal_do_not_use_run_tests if unused

Reviewed-by: Philip Withnall <withnall@endlessm.com>
Signed-off-by: Simon McVittie <smcv@collabora.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103601
---

diff --git a/dbus/dbus-test.c b/dbus/dbus-test.c
index 6c0d71f63..312fb78bc 100644
--- a/dbus/dbus-test.c
+++ b/dbus/dbus-test.c
@@ -86,8 +86,6 @@ run_data_test (const char             *test_name,
     }
 }
 
-#endif /* DBUS_ENABLE_EMBEDDED_TESTS */
-
 /**
  * An exported symbol to be run in order to execute
  * unit tests. Should not be used by
@@ -101,7 +99,6 @@ run_data_test (const char             *test_name,
 void
 dbus_internal_do_not_use_run_tests (const char *test_data_dir, const char *specific_test)
 {
-#ifdef DBUS_ENABLE_EMBEDDED_TESTS
   if (!_dbus_threads_init_debug ())
     die ("debug threads init");
   
@@ -168,8 +165,6 @@ dbus_internal_do_not_use_run_tests (const char *test_data_dir, const char *speci
   run_data_test ("auth", specific_test, _dbus_auth_test, test_data_dir);
 
   printf ("%s: completed successfully\n", "test-dbus");
-#else
-  printf ("Not compiled with unit tests, not running any\n");
-#endif
 }
 
+#endif /* DBUS_ENABLE_EMBEDDED_TESTS */