Rename dbus-test to test-dbus to match common test application naming scheme.

[reverted the dbus-specification part -smcv]
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73495
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>

diff --git a/HACKING b/HACKING
index 805fd2e00de22cfbef8f1ffdd73529abc60ac009..8c993b66d543882ffbafa64a21174a2774010320 100644 (file)
--- a/HACKING
+++ b/HACKING
@@ -267,7 +267,7 @@ Tests
 These are the test programs that are built if dbus is compiled using
 --enable-tests.
 
-dbus/dbus-test
+dbus/test-dbus
 This is the main unit test program that tests all aspects of the D-Bus
 client library.
 

diff --git a/README.win b/README.win
index 01032e1acbd5ca5c084a3408e800634b01b531b2..bd67c18840fe4578d1e551e5c9b91614824cccba 100644 (file)
--- a/README.win
+++ b/README.win
@@ -31,10 +31,10 @@ updated with windows specific stuff.
 Tests
 -----
  - dbus library check
-    bin\dbus-test.exe <build-root>\test\data
+    bin\test-dbus.exe <build-root>\test\data
 
  - bus daemon check
-    bin\bus-test.exe <build-root>\test\data
+    bin\test-bus.exe <build-root>\test\data
 
  - check available names
     bin\test_names.exe

diff --git a/cmake/dbus/CMakeLists.txt b/cmake/dbus/CMakeLists.txt
index cea22985c591ab64a718ab56132659b0fe55df68..a5481b784acb4fddc4b7f9527c53827b85186650 100644 (file)
--- a/cmake/dbus/CMakeLists.txt
+++ b/cmake/dbus/CMakeLists.txt
@@ -297,8 +297,8 @@ else(WIN32)
 endif(WIN32)
 
 if (DBUS_ENABLE_EMBEDDED_TESTS)
-       add_test_executable(dbus-test ${CMAKE_SOURCE_DIR}/../dbus/dbus-test-main.c ${DBUS_INTERNAL_LIBRARIES})
-       set_target_properties(dbus-test PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS})
+       add_test_executable(test-dbus ${CMAKE_SOURCE_DIR}/../dbus/dbus-test-main.c ${DBUS_INTERNAL_LIBRARIES})
+       set_target_properties(test-dbus PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS})
 ENDIF (DBUS_ENABLE_EMBEDDED_TESTS)
 
 if (UNIX)

diff --git a/dbus/.gitignore b/dbus/.gitignore
index 34eace4d65ff9b2ec25e47718cb876a96b332f9e..fd91ccee5ecfc360391b49d9fcf55b8af7a19b9f 100644 (file)
--- a/dbus/.gitignore
+++ b/dbus/.gitignore
@@ -4,7 +4,7 @@ Makefile
 Makefile.in
 *.lo
 *.la
-dbus-test
+test-dbus
 *.bb
 *.bbg
 *.gcov

diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index 0f9033d1ed92c452d23347a79c3cd909ee01057c..b2481073170090927240718186cd83a06557f07d 100644 (file)
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -312,13 +312,13 @@ noinst_PROGRAMS =
 
 if DBUS_ENABLE_EMBEDDED_TESTS
 # We can't actually run this til we've reached test/
-noinst_PROGRAMS += dbus-test
+noinst_PROGRAMS += test-dbus
 endif
 
-dbus_test_SOURCES=                             \
+test_dbus_SOURCES=                             \
        dbus-test-main.c
 
-dbus_test_LDADD = libdbus-internal.la
+test_dbus_LDADD = libdbus-internal.la
 
 ## mop up the gcov files
 clean-local:

diff --git a/dbus/dbus-test.c b/dbus/dbus-test.c
index b707ee22da598c7fd72ade3a45e85efcaa5c1a47..5990d6ec9790c2d0bfc5f248ecba49914362ed8c 100644 (file)
--- a/dbus/dbus-test.c
+++ b/dbus/dbus-test.c
@@ -41,7 +41,7 @@ check_memleaks (void)
 {
   dbus_shutdown ();
 
-  printf ("%s: checking for memleaks\n", "dbus-test");
+  printf ("%s: checking for memleaks\n", "test-dbus");
   if (_dbus_get_malloc_blocks_outstanding () != 0)
     {
       _dbus_warn ("%d dbus_malloc blocks were not freed\n",
@@ -60,7 +60,7 @@ run_test (const char             *test_name,
 {
   if (!specific_test || strcmp (specific_test, test_name) == 0)
     {
-      printf ("%s: running %s tests\n", "dbus-test", test_name);
+      printf ("%s: running %s tests\n", "test-dbus", test_name);
       if (!test ())
        die (test_name);
 
@@ -76,7 +76,7 @@ run_data_test (const char             *test_name,
 {
   if (!specific_test || strcmp (specific_test, test_name) == 0)
     {
-      printf ("%s: running %s tests\n", "dbus-test", test_name);
+      printf ("%s: running %s tests\n", "test-dbus", test_name);
       if (!test (test_data_dir))
        die (test_name);
 
@@ -165,7 +165,7 @@ 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", "dbus-test");
+  printf ("%s: completed successfully\n", "test-dbus");
 #else
   printf ("Not compiled with unit tests, not running any\n");
 #endif

diff --git a/doc/dbus-test-plan.xml b/doc/dbus-test-plan.xml
index ee9111491885f33180cf5d64631f29122326c05f..ed918e55dbee0582fe5e18092757c0a2d0216ec8 100644 (file)
--- a/doc/dbus-test-plan.xml
+++ b/doc/dbus-test-plan.xml
@@ -48,7 +48,7 @@
   <sect1 id="client-library">
     <title>Testing the D-Bus client library</title>
     <para>
-      The tests for the client library consist of the dbus-test
+      The tests for the client library consist of the test-dbus
       program which is a unit test for all aspects of the client
       library. Whenever a bug in the client library is found and
       fixed, a test is added to make sure that the bug won't occur again.
@@ -58,7 +58,7 @@
       <para>
       The D-Bus client library consists of some data structures that
       are used internally; a linked list class, a hashtable class and
-      a string class. All aspects of those are tested by dbus-test.
+      a string class. All aspects of those are tested by test-dbus.
       </para>
     </sect2>
     <sect2 id="message-loader">
@@ -104,7 +104,7 @@
         the D-Bus Reference Manual.
       </para>
       <para>
-        The message test part of dbus-test is using the message
+        The message test part of test-dbus is using the message
         builder to build different kinds of messages, both valid,
         invalid, and invalid ones, to make sure that the loader won't
         crash or leak memory of any of those, and that the loader

diff --git a/test/Makefile.am b/test/Makefile.am
index 09b94561869ff1a34de57d639f6edf3156ddf30c..b23eb99f2db89c82cdfce11bda632d4ff3f2ff15 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -76,7 +76,7 @@ TEST_BINARIES = \
 TESTS = \
        ../bus/bus-test$(EXEEXT) \
        ../bus/bus-test-system$(EXEEXT) \
-       ../dbus/dbus-test$(EXEEXT) \
+       ../dbus/test-dbus$(EXEEXT) \
        $(NULL)
 
 if DBUS_UNIX