From 93faa3359788ac8a42dbd93b7df11a562ca33692 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Tue, 14 Jan 2014 18:45:39 +0100 Subject: [PATCH 5/7] Rename bus-test-system to test-bus-system to match common test application naming scheme. --- bus/.gitignore | 2 +- bus/Makefile.am | 6 +++--- test/Makefile.am | 2 +- 3 Dateien geändert, 5 Zeilen hinzugefügt(+), 5 Zeilen entfernt(-) diff --git a/bus/.gitignore b/bus/.gitignore index 3c6def7..ae0299d 100644 --- a/bus/.gitignore +++ b/bus/.gitignore @@ -20,7 +20,7 @@ messagebus-config session.conf system.conf bus-test-launch-helper -bus-test-system +test-bus-system dbus.service dbus.socket org.freedesktop.dbus-session.plist diff --git a/bus/Makefile.am b/bus/Makefile.am index 65073e4..dc418e7 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 += test-bus bus-test-system +noinst_PROGRAMS += test-bus test-bus-system if DBUS_UNIX # run as a test by test/Makefile.am @@ -180,7 +180,7 @@ endif DBUS_UNIX endif DBUS_ENABLE_EMBEDDED_TESTS -bus_test_system_SOURCES= \ +test_bus_system_SOURCES= \ $(XML_SOURCES) \ config-parser-common.c \ config-parser-common.h \ @@ -190,7 +190,7 @@ bus_test_system_SOURCES= \ utils.h \ test-system.c -bus_test_system_LDADD=$(top_builddir)/dbus/libdbus-internal.la $(DBUS_BUS_LIBS) +test_bus_system_LDADD=$(top_builddir)/dbus/libdbus-internal.la $(DBUS_BUS_LIBS) test_bus_SOURCES= \ $(BUS_SOURCES) \ diff --git a/test/Makefile.am b/test/Makefile.am index eae32e5..b6d39f7 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -75,7 +75,7 @@ TEST_BINARIES = \ ## since they depend on stuff from this directory TESTS = \ ../bus/test-bus$(EXEEXT) \ - ../bus/bus-test-system$(EXEEXT) \ + ../bus/test-bus-system$(EXEEXT) \ ../dbus/test-dbus$(EXEEXT) \ $(NULL) -- 1.7.10.4