diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2014-01-14 18:52:22 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-01-17 16:29:37 +0000 |
| commit | 7e373d4527286ae0ecdc4ccd2064293c61f3b907 (patch) | |
| tree | 78fb95904578fcb695f8fe5369c0c656e5032ebd | |
| parent | cf41239d6684efa3f5d648b1fa84c4fe07148691 (diff) | |
| download | dbus-7e373d4527286ae0ecdc4ccd2064293c61f3b907.tar.gz | |
Rename bus-test-launch-helper to test-bus-launch_helper 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>
| -rw-r--r-- | bus/.gitignore | 2 | ||||
| -rw-r--r-- | bus/Makefile.am | 8 | ||||
| -rw-r--r-- | cmake/bus/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | test/Makefile.am | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/bus/.gitignore b/bus/.gitignore index ae0299d4..d856369b 100644 --- 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 dc418e79..f335e30c 100644 --- 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 4da3a539..f5b41cd8 100644 --- 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 e3e1fa47..cec5cdab 100644 --- 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 |