Commit e782b080 authored by Ralf Habacker's avatar Ralf Habacker Committed by Simon McVittie

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

[Add its source file to SOURCES: this test was previously relying on the
Automake feature that the default value of foo_bar_SOURCES is foo-bar.c. -smcv]

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73495Reviewed-by: default avatarSimon McVittie <simon.mcvittie@collabora.co.uk>
parent 0cd07149
......@@ -27,7 +27,7 @@ set (test-shell-service_SOURCES
${CMAKE_SOURCE_DIR}/../test/test-shell-service.c
)
set (shell-test_SOURCES
set (test-shell_SOURCES
${CMAKE_SOURCE_DIR}/../test/shell-test.c
)
......@@ -49,7 +49,7 @@ set (test-sleep-forever_SOURCES
add_helper_executable(test-service ${test-service_SOURCES} dbus-testutils)
add_helper_executable(test-names ${test-names_SOURCES} dbus-testutils)
add_test_executable(shell-test ${shell-test_SOURCES} ${DBUS_INTERNAL_LIBRARIES})
add_test_executable(test-shell ${test-shell_SOURCES} ${DBUS_INTERNAL_LIBRARIES})
add_test_executable(test-printf ${CMAKE_SOURCE_DIR}/../test/internals/printf.c dbus-testutils)
add_helper_executable(test-shell-service ${test-shell-service_SOURCES} dbus-testutils)
add_helper_executable(spawn-test ${spawn-test_SOURCES} ${DBUS_INTERNAL_LIBRARIES})
......@@ -164,7 +164,7 @@ FOREACH(FILE ${FILES})
ENDFOREACH(FILE)
add_custom_target(check
COMMAND ctest -R shell-test
COMMAND ctest -R test-shell
COMMAND ctest -R test-printf
COMMAND ctest -R test-corrupt
COMMAND ctest -R test-dbus-daemon
......
......@@ -21,7 +21,7 @@ test-segfault
test-service
test-sleep-forever
decode-gcov
shell-test
test-shell
test-shell-service
test-names
test-loopback
......
......@@ -100,8 +100,9 @@ test_names_LDADD = libdbus-testutils-internal.la
## break_loader_LDADD = $(top_builddir)/dbus/libdbus-internal.la
test_shell_service_CPPFLAGS = $(static_cppflags)
test_shell_service_LDADD = libdbus-testutils-internal.la
shell_test_CPPFLAGS = $(static_cppflags)
shell_test_LDADD = libdbus-testutils-internal.la
test_shell_SOURCES = shell-test.c
test_shell_CPPFLAGS = $(static_cppflags)
test_shell_LDADD = libdbus-testutils-internal.la
spawn_test_CPPFLAGS = $(static_cppflags)
spawn_test_LDADD = $(top_builddir)/dbus/libdbus-internal.la
......@@ -124,7 +125,7 @@ testexecdir = $(libdir)/dbus-1.0/test
testexec_PROGRAMS =
installable_tests = \
shell-test \
test-shell \
test-printf \
$(NULL)
installable_manual_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