summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Habacker <ralf.habacker@freenet.de>2014-01-11 10:07:21 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2014-01-17 16:29:19 +0000
commit54440baa2192abe889957a23e4448c599ce32260 (patch)
tree7f2e459d208af9e44be7496db8d67a351443a581
parente782b0806eed9f46164b8aa5da7c1b12109175bf (diff)
downloaddbus-54440baa2192abe889957a23e4448c599ce32260.tar.gz
Rename spawn-test to test-spawn to match common test application naming scheme.
[Same change as for shell-test in the previous commit. -smcv] Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73495 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
-rw-r--r--cmake/test/CMakeLists.txt4
-rw-r--r--test/.gitignore2
-rw-r--r--test/Makefile.am7
3 files changed, 7 insertions, 6 deletions
diff --git a/cmake/test/CMakeLists.txt b/cmake/test/CMakeLists.txt
index f1506738..5d5cb949 100644
--- a/cmake/test/CMakeLists.txt
+++ b/cmake/test/CMakeLists.txt
@@ -31,7 +31,7 @@ set (test-shell_SOURCES
${CMAKE_SOURCE_DIR}/../test/shell-test.c
)
-set (spawn-test_SOURCES
+set (test-spawn_SOURCES
${CMAKE_SOURCE_DIR}/../test/spawn-test.c
)
@@ -52,7 +52,7 @@ add_helper_executable(test-names ${test-names_SOURCES} dbus-testutils)
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})
+add_helper_executable(test-spawn ${test-spawn_SOURCES} ${DBUS_INTERNAL_LIBRARIES})
add_helper_executable(test-exit ${test-exit_SOURCES} ${DBUS_INTERNAL_LIBRARIES})
add_helper_executable(test-segfault ${test-segfault_SOURCES} ${DBUS_INTERNAL_LIBRARIES})
add_helper_executable(test-sleep-forever ${test-sleep-forever_SOURCES} ${DBUS_INTERNAL_LIBRARIES})
diff --git a/test/.gitignore b/test/.gitignore
index 814a35cc..71b3cec9 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -14,7 +14,7 @@ unbase64
*.da
*.gcov
break-loader
-spawn-test
+test-spawn
test-corrupt
test-exit
test-segfault
diff --git a/test/Makefile.am b/test/Makefile.am
index ddb69b4f..af2a0a23 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -61,7 +61,7 @@ if DBUS_ENABLE_EMBEDDED_TESTS
## break-loader removed for now
## these binaries are used in tests but are not themselves tests
TEST_BINARIES = \
- spawn-test \
+ test-spawn \
test-exit \
test-names \
test-segfault \
@@ -103,8 +103,9 @@ test_shell_service_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
+test_spawn_SOURCES = spawn-test.c
+test_spawn_CPPFLAGS = $(static_cppflags)
+test_spawn_LDADD = $(top_builddir)/dbus/libdbus-internal.la
test_printf_SOURCES = internals/printf.c
test_printf_CPPFLAGS = $(static_cppflags)