From eb2a4b83765a1ca63e7f123be9e584cf76eed50e Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Fri, 10 Jan 2014 02:17:22 +0100
Subject: [PATCH 1/8] Rename shell-test to test-shell to match common test
 application naming scheme.

---
 cmake/test/CMakeLists.txt |    8 ++--
 test/.gitignore           |    2 +-
 test/Makefile.am          |    6 +--
 test/shell-test.c         |  109 ---------------------------------------------
 test/test-shell.c         |  109 +++++++++++++++++++++++++++++++++++++++++++++
 5 Dateien geändert, 117 Zeilen hinzugefügt(+), 117 Zeilen entfernt(-)
 delete mode 100644 test/shell-test.c
 create mode 100644 test/test-shell.c

diff --git a/cmake/test/CMakeLists.txt b/cmake/test/CMakeLists.txt
index 327b092..193adca 100644
--- a/cmake/test/CMakeLists.txt
+++ b/cmake/test/CMakeLists.txt
@@ -27,8 +27,8 @@ set (test-shell-service_SOURCES
     ${CMAKE_SOURCE_DIR}/../test/test-shell-service.c
 )
 
-set (shell-test_SOURCES
-        ${CMAKE_SOURCE_DIR}/../test/shell-test.c
+set (test-shell_SOURCES
+        ${CMAKE_SOURCE_DIR}/../test/shell-test.c
 )
 
 set (spawn-test_SOURCES
@@ -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
diff --git a/test/.gitignore b/test/.gitignore
index 1337de6..814a35c 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -21,7 +21,7 @@ test-segfault
 test-service
 test-sleep-forever
 decode-gcov
-shell-test
+test-shell
 test-shell-service
 test-names
 test-loopback
diff --git a/test/Makefile.am b/test/Makefile.am
index 09b9456..06d06e3 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -100,8 +100,8 @@ 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_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 +124,7 @@ testexecdir = $(libdir)/dbus-1.0/test
 testexec_PROGRAMS =
 
 installable_tests = \
-	shell-test \
+	test-shell \
 	test-printf \
 	$(NULL)
 installable_manual_tests = \
-- 
1.7.10.4