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

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73495
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>

diff --git a/bus/.gitignore b/bus/.gitignore
index 861dc1f..3c6def7 100644 (file)
--- a/bus/.gitignore
+++ b/bus/.gitignore
@@ -13,7 +13,7 @@ dbus-daemon-launch-helper-test
 *.bbg
 *.da
 *.gcov
-bus-test
+test-bus
 rc.messagebus
 messagebus
 messagebus-config

diff --git a/bus/Makefile.am b/bus/Makefile.am
index cd0c67d..65073e4 100644 (file)
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -169,7 +169,7 @@ if DBUS_ENABLE_EMBEDDED_TESTS
 ## even when not doing "make check"
 
 # run as a test by test/Makefile.am
-noinst_PROGRAMS += bus-test bus-test-system
+noinst_PROGRAMS += test-bus bus-test-system
 
 if DBUS_UNIX
 # run as a test by test/Makefile.am
@@ -192,11 +192,11 @@ bus_test_system_SOURCES=                  \
 
 bus_test_system_LDADD=$(top_builddir)/dbus/libdbus-internal.la $(DBUS_BUS_LIBS)
 
-bus_test_SOURCES=                              \
+test_bus_SOURCES=                              \
        $(BUS_SOURCES)                          \
        test-main.c
 
-bus_test_LDADD=$(top_builddir)/dbus/libdbus-internal.la $(DBUS_BUS_LIBS)
+test_bus_LDADD=$(top_builddir)/dbus/libdbus-internal.la $(DBUS_BUS_LIBS)
 
 ## mop up the gcov files
 clean-local:

diff --git a/cmake/bus/CMakeLists.txt b/cmake/bus/CMakeLists.txt
index 5623531..4da3a53 100644 (file)
--- a/cmake/bus/CMakeLists.txt
+++ b/cmake/bus/CMakeLists.txt
@@ -107,8 +107,8 @@ endif (DBUS_SERVICE)
 
 if (DBUS_ENABLE_EMBEDDED_TESTS)
        set(SOURCES ${BUS_SOURCES} ${BUS_DIR}/test-main.c)
-       add_test_executable(bus-test "${SOURCES}"  ${DBUS_INTERNAL_LIBRARIES} ${XML_LIBRARY})
-       set_target_properties(bus-test PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS})
+       add_test_executable(test-bus "${SOURCES}"  ${DBUS_INTERNAL_LIBRARIES} ${XML_LIBRARY})
+       set_target_properties(test-bus PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS})
 endif (DBUS_ENABLE_EMBEDDED_TESTS)
 
 if(MSVC)

diff --git a/doc/dbus-test-plan.xml b/doc/dbus-test-plan.xml
index ed918e5..e3efd2c 100644 (file)
--- a/doc/dbus-test-plan.xml
+++ b/doc/dbus-test-plan.xml
@@ -170,10 +170,10 @@
         a socket.
       </para>
     </sect2>
-    <sect2 id="bus-test">
-      <title>The bus-test program</title>
+    <sect2 id="test-bus">
+      <title>The test-bus program</title>
       <para>
-        The bus-test program is a program that is used to test various
+        The test-bus program is a program that is used to test various
         parts of the D-Bus bus daemon; robustness and that it conforms
         to the specifications.
       </para>
@@ -185,7 +185,7 @@
         testing easier.
       </para>
       <para>
-        The bus-test program should test all major features of the
+        The test-bus program should test all major features of the
         bus, such as service registration, notification when things
         occurs and message matching.
       </para>

diff --git a/test/.gitignore b/test/.gitignore
index 71b3cec..de1dfe1 100644 (file)
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -7,7 +7,7 @@ Makefile.in
 *.o
 echo-server
 echo-client
-bus-test
+test-bus
 unbase64
 *.bb
 *.bbg

diff --git a/test/Makefile.am b/test/Makefile.am
index af2a0a2..3155e87 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -74,7 +74,7 @@ TEST_BINARIES = \
 ## order, but we don't want to run them til we arrive in this directory,
 ## since they depend on stuff from this directory
 TESTS = \
-       ../bus/bus-test$(EXEEXT) \
+       ../bus/test-bus$(EXEEXT) \
        ../bus/bus-test-system$(EXEEXT) \
        ../dbus/test-dbus$(EXEEXT) \
        $(NULL)