From 936b3ef783e54f6b31e3bb454f1fcb55ffe283da Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Mon, 13 Jan 2014 20:45:37 +0100 Subject: [PATCH 4/5] Rename bus-test to test-bus to match common test application naming scheme. --- bus/Makefile.am | 6 +++--- cmake/bus/CMakeLists.txt | 4 ++-- test/.gitignore | 2 +- test/Makefile.am | 2 +- 4 Dateien geändert, 7 Zeilen hinzugefügt(+), 7 Zeilen entfernt(-) diff --git a/bus/Makefile.am b/bus/Makefile.am index cd0c67d..65073e4 100644 --- a/bus/Makefile.am +++ b/bus/Makefile.am @@ -169,7 +169,7 @@ if DBUS_ENABLE_EMBEDDED_TESTS ## even when not doing "make check" # run as a test by test/Makefile.am -noinst_PROGRAMS += bus-test bus-test-system +noinst_PROGRAMS += test-bus bus-test-system if DBUS_UNIX # run as a test by test/Makefile.am @@ -192,11 +192,11 @@ bus_test_system_SOURCES= \ bus_test_system_LDADD=$(top_builddir)/dbus/libdbus-internal.la $(DBUS_BUS_LIBS) -bus_test_SOURCES= \ +test_bus_SOURCES= \ $(BUS_SOURCES) \ test-main.c -bus_test_LDADD=$(top_builddir)/dbus/libdbus-internal.la $(DBUS_BUS_LIBS) +test_bus_LDADD=$(top_builddir)/dbus/libdbus-internal.la $(DBUS_BUS_LIBS) ## mop up the gcov files clean-local: diff --git a/cmake/bus/CMakeLists.txt b/cmake/bus/CMakeLists.txt index 5623531..4da3a53 100644 --- a/cmake/bus/CMakeLists.txt +++ b/cmake/bus/CMakeLists.txt @@ -107,8 +107,8 @@ endif (DBUS_SERVICE) if (DBUS_ENABLE_EMBEDDED_TESTS) set(SOURCES ${BUS_SOURCES} ${BUS_DIR}/test-main.c) - add_test_executable(bus-test "${SOURCES}" ${DBUS_INTERNAL_LIBRARIES} ${XML_LIBRARY}) - set_target_properties(bus-test PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS}) + add_test_executable(test-bus "${SOURCES}" ${DBUS_INTERNAL_LIBRARIES} ${XML_LIBRARY}) + set_target_properties(test-bus PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS}) endif (DBUS_ENABLE_EMBEDDED_TESTS) if(MSVC) diff --git a/test/.gitignore b/test/.gitignore index 71b3cec..de1dfe1 100644 --- a/test/.gitignore +++ b/test/.gitignore @@ -7,7 +7,7 @@ Makefile.in *.o echo-server echo-client -bus-test +test-bus unbase64 *.bb *.bbg diff --git a/test/Makefile.am b/test/Makefile.am index e40abb0..eae32e5 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -74,7 +74,7 @@ TEST_BINARIES = \ ## order, but we don't want to run them til we arrive in this directory, ## since they depend on stuff from this directory TESTS = \ - ../bus/bus-test$(EXEEXT) \ + ../bus/test-bus$(EXEEXT) \ ../bus/bus-test-system$(EXEEXT) \ ../dbus/test-dbus$(EXEEXT) \ $(NULL) -- 1.7.10.4