Rename bus-test-launch-helper to test-bus-launch_helper to match common test applicat...

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

diff --git a/bus/Makefile.am b/bus/Makefile.am
index dc418e7..f335e30 100644 (file)
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -140,15 +140,15 @@ dbus_daemon_launch_helper_test_CPPFLAGS = \
 
 ## we build yet another binary so we can do the OOM tests
 ## DO NOT INSTALL THIS FILE
-bus_test_launch_helper_SOURCES=                \
+test_bus_launch_helper_SOURCES=                \
        test-launch-helper.c            \
        $(LAUNCH_HELPER_SOURCES)
 
-bus_test_launch_helper_LDADD=          \
+test_bus_launch_helper_LDADD=          \
        $(top_builddir)/dbus/libdbus-internal.la \
        $(DBUS_LAUNCHER_LIBS)
 
-bus_test_launch_helper_CPPFLAGS = \
+test_bus_launch_helper_CPPFLAGS = \
        $(AM_CPPFLAGS) \
        -DACTIVATION_LAUNCHER_TEST      \
        -DACTIVATION_LAUNCHER_DO_OOM
@@ -173,7 +173,7 @@ noinst_PROGRAMS += test-bus test-bus-system
 
 if DBUS_UNIX
 # run as a test by test/Makefile.am
-noinst_PROGRAMS += bus-test-launch-helper
+noinst_PROGRAMS += test-bus-launch-helper
 # this is used by the tests but is not,itself, a test
 noinst_PROGRAMS += dbus-daemon-launch-helper-test
 endif DBUS_UNIX

diff --git a/cmake/bus/CMakeLists.txt b/cmake/bus/CMakeLists.txt
index 4da3a53..f5b41cd 100644 (file)
--- a/cmake/bus/CMakeLists.txt
+++ b/cmake/bus/CMakeLists.txt
@@ -146,8 +146,8 @@ if(NOT WIN32)
    target_link_libraries(dbus-daemon-launch-helper-test ${DBUS_INTERNAL_LIBRARIES} ${XML_LIBRARY} )
    
    set (SOURCES ${LAUNCH_HELPER_SOURCES} ${BUS_DIR}/test-launch-helper.c)
-   add_test_executable(bus-test-launch-helper "${SOURCES}"  ${DBUS_INTERNAL_LIBRARIES} ${XML_LIBRARY})
-   set_target_properties(bus-test-launch-helper PROPERTIES COMPILE_FLAGS "-DACTIVATION_LAUNCHER_TEST -DACTIVATION_LAUNCHER_DO_OOM")
+   add_test_executable(test-bus-launch-helper "${SOURCES}"  ${DBUS_INTERNAL_LIBRARIES} ${XML_LIBRARY})
+   set_target_properties(test-bus-launch-helper PROPERTIES COMPILE_FLAGS "-DACTIVATION_LAUNCHER_TEST -DACTIVATION_LAUNCHER_DO_OOM")
 endif(NOT WIN32)
 
 #### Init scripts fun

diff --git a/test/Makefile.am b/test/Makefile.am
index e3e1fa4..cec5cda 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -80,7 +80,7 @@ TESTS = \
        $(NULL)
 
 if DBUS_UNIX
-TESTS += ../bus/bus-test-launch-helper$(EXEEXT)
+TESTS += ../bus/test-bus-launch-helper$(EXEEXT)
 endif
 
 else !DBUS_ENABLE_EMBEDDED_TESTS