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

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 3c6def7..ae0299d 100644 (file)
--- a/bus/.gitignore
+++ b/bus/.gitignore
@@ -20,7 +20,7 @@ messagebus-config
 session.conf
 system.conf
 bus-test-launch-helper
-bus-test-system
+test-bus-system
 dbus.service
 dbus.socket
 org.freedesktop.dbus-session.plist

diff --git a/bus/Makefile.am b/bus/Makefile.am
index 65073e4..dc418e7 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 += test-bus bus-test-system
+noinst_PROGRAMS += test-bus test-bus-system
 
 if DBUS_UNIX
 # run as a test by test/Makefile.am
@@ -180,7 +180,7 @@ endif DBUS_UNIX
 
 endif DBUS_ENABLE_EMBEDDED_TESTS
 
-bus_test_system_SOURCES=                       \
+test_bus_system_SOURCES=                       \
        $(XML_SOURCES)                          \
        config-parser-common.c                  \
        config-parser-common.h                  \
@@ -190,7 +190,7 @@ bus_test_system_SOURCES=                    \
        utils.h                                 \
        test-system.c
 
-bus_test_system_LDADD=$(top_builddir)/dbus/libdbus-internal.la $(DBUS_BUS_LIBS)
+test_bus_system_LDADD=$(top_builddir)/dbus/libdbus-internal.la $(DBUS_BUS_LIBS)
 
 test_bus_SOURCES=                              \
        $(BUS_SOURCES)                          \

diff --git a/test/Makefile.am b/test/Makefile.am
index 3155e87..e3e1fa4 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -75,7 +75,7 @@ TEST_BINARIES = \
 ## since they depend on stuff from this directory
 TESTS = \
        ../bus/test-bus$(EXEEXT) \
-       ../bus/bus-test-system$(EXEEXT) \
+       ../bus/test-bus-system$(EXEEXT) \
        ../dbus/test-dbus$(EXEEXT) \
        $(NULL)