diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-06-17 12:29:17 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-11-19 15:33:34 +0000 |
| commit | 7ee9f5c9b91c0f3e196bf47e96ec7cc01c0c7509 (patch) | |
| tree | c3943b830fe32efd8fbbefddcf52128953f02ec6 | |
| parent | 23ad1e98c62fd31adf06dd1f138be3853855f4a7 (diff) | |
| download | dbus-glib-7ee9f5c9b91c0f3e196bf47e96ec7cc01c0c7509.tar.gz | |
Use standard autotools @abs_top_builddir@ to replace TEST_SERVICE_BINARY etc.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40711
Reviewed-by: Dan Williams <dcbw@redhat.com>
| -rw-r--r-- | configure.ac | 20 | ||||
| -rw-r--r-- | test/core/Makefile.am | 2 | ||||
| -rw-r--r-- | test/data/valid-service-files/debug-echo.service.in | 2 | ||||
| -rw-r--r-- | test/data/valid-service-files/debug-glib.service.in | 2 | ||||
| -rw-r--r-- | test/data/valid-service-files/interfaces-test.service.in | 2 | ||||
| -rw-r--r-- | test/interfaces/Makefile.am | 2 |
6 files changed, 5 insertions, 25 deletions
diff --git a/configure.ac b/configure.ac index b0cf725..7a7dd27 100644 --- a/configure.ac +++ b/configure.ac @@ -357,26 +357,6 @@ AC_SUBST(DBUS_GLIB_TOOL_LIBS) ### gtk-doc Documentation GTK_DOC_CHECK(1.4) -#### Tell tests where to find certain stuff in builddir -ABSOLUTE_TOP_BUILDDIR=`cd ${ac_top_builddir}. && pwd` - -AC_DEFUN([TEST_PATH], [ -TEST_$1=${ABSOLUTE_TOP_BUILDDIR}/test/$2 -AC_DEFINE_UNQUOTED(TEST_$1, "$TEST_$1", - [Full path to test file test/$2 in builddir]) -AC_SUBST(TEST_$1) -]) - -TEST_PATH(SERVICE_DIR, data/valid-service-files) -TEST_PATH(SERVICE_BINARY, test-service) -TEST_PATH(SHELL_SERVICE_BINARY, test-shell-service) -TEST_PATH(CORE_SERVICE_BINARY, core/test-service-glib) -TEST_PATH(INTERFACES_SERVICE_BINARY, interfaces/test-service) -TEST_PATH(EXIT_BINARY, test-exit) -TEST_PATH(SEGFAULT_BINARY, test-segfault) -TEST_PATH(SLEEP_FOREVER_BINARY, test-sleep-forever) -AC_SUBST(ABSOLUTE_TOP_BUILDDIR) - if ! test -z "$with_test_socket_dir" ; then TEST_SOCKET_DIR="$with_test_socket_dir" else diff --git a/test/core/Makefile.am b/test/core/Makefile.am index 9a8c799..64b7c9c 100644 --- a/test/core/Makefile.am +++ b/test/core/Makefile.am @@ -24,7 +24,7 @@ tool_ldadd = \ ## so if adding tests not to be run in make check, don't add them to ## TESTS if DBUS_BUILD_TESTS -TESTS_ENVIRONMENT=DBUS_TOP_BUILDDIR=$(ABSOLUTE_TOP_BUILDDIR) +TESTS_ENVIRONMENT=DBUS_TOP_BUILDDIR=@abs_top_builddir@ TESTS=run-test.sh run-peer-test.sh else TESTS= diff --git a/test/data/valid-service-files/debug-echo.service.in b/test/data/valid-service-files/debug-echo.service.in index 735a98a..64603c0 100644 --- a/test/data/valid-service-files/debug-echo.service.in +++ b/test/data/valid-service-files/debug-echo.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.freedesktop.DBus.GLib.TestEchoService -Exec=@TEST_SERVICE_BINARY@ +Exec=@abs_top_builddir@/test/test-service@EXEEXT@ diff --git a/test/data/valid-service-files/debug-glib.service.in b/test/data/valid-service-files/debug-glib.service.in index d0d3761..4b1ceeb 100644 --- a/test/data/valid-service-files/debug-glib.service.in +++ b/test/data/valid-service-files/debug-glib.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.freedesktop.DBus.GLib.TestService -Exec=@TEST_CORE_SERVICE_BINARY@ +Exec=@abs_top_builddir@/test/core/test-service-glib@EXEEXT@ diff --git a/test/data/valid-service-files/interfaces-test.service.in b/test/data/valid-service-files/interfaces-test.service.in index 8710d5c..77bd001 100644 --- a/test/data/valid-service-files/interfaces-test.service.in +++ b/test/data/valid-service-files/interfaces-test.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.freedesktop.DBus.GLib.Test.Interfaces -Exec=@TEST_INTERFACES_SERVICE_BINARY@ +Exec=@abs_top_builddir@/test/interfaces/test-service@EXEEXT@ diff --git a/test/interfaces/Makefile.am b/test/interfaces/Makefile.am index 3e83482..f37aa31 100644 --- a/test/interfaces/Makefile.am +++ b/test/interfaces/Makefile.am @@ -17,7 +17,7 @@ LDADD = $(DBUS_GLIB_LIBS) \ ## TESTS if DBUS_BUILD_TESTS TESTS_ENVIRONMENT = \ - DBUS_TOP_BUILDDIR=$(ABSOLUTE_TOP_BUILDDIR) \ + DBUS_TOP_BUILDDIR=@abs_top_builddir@ \ DBUS_BINDING_TOOL=$(DBUS_BINDING_TOOL) \ $(NULL) TESTS=run-test.sh |