Commit 7e373d45 authored by Ralf Habacker's avatar Ralf Habacker Committed by Simon McVittie

Rename bus-test-launch-helper to test-bus-launch_helper to match common test…

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=73495Reviewed-by: 's avatarSimon McVittie <simon.mcvittie@collabora.co.uk>
parent cf41239d
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment