diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-04-01 13:07:36 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-04-16 13:06:26 +0100 |
| commit | 46e2759883ba308284176068a653b0af4536de30 (patch) | |
| tree | 2738b9cae48f1e89f8ff5dc69060195c2450efa4 | |
| parent | bb4b586d7cea7270a303a3c845979fdeb694f905 (diff) | |
name-test: also switch to AM_TESTS_ENVIRONMENT here
Reviewed-by: Philip Withnall <philip.withnall@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89846
| -rw-r--r-- | test/name-test/Makefile.am | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test/name-test/Makefile.am b/test/name-test/Makefile.am index c6611aa3..ad637ecd 100644 --- a/test/name-test/Makefile.am +++ b/test/name-test/Makefile.am @@ -11,13 +11,13 @@ AM_LDFLAGS = @R_DYNAMIC_LDFLAG@ ## so if adding tests not to be run in make check, don't add them to ## TESTS if DBUS_ENABLE_EMBEDDED_TESTS -TESTS_ENVIRONMENT = \ - DBUS_TOP_BUILDDIR=@abs_top_builddir@ \ - DBUS_TOP_SRCDIR=@abs_top_srcdir@ \ - PYTHON=@PYTHON@ \ - DBUS_TEST_DATA=@abs_top_builddir@/test/data \ - DBUS_TEST_DAEMON=@abs_top_builddir@/bus/dbus-daemon$(EXEEXT) \ - XDG_RUNTIME_DIR=@abs_top_builddir@/test/XDG_RUNTIME_DIR \ +AM_TESTS_ENVIRONMENT = \ + export DBUS_TOP_BUILDDIR=@abs_top_builddir@; \ + export DBUS_TOP_SRCDIR=@abs_top_srcdir@; \ + export PYTHON=@PYTHON@; \ + export DBUS_TEST_DATA=@abs_top_builddir@/test/data; \ + export DBUS_TEST_DAEMON=@abs_top_builddir@/bus/dbus-daemon$(EXEEXT); \ + export XDG_RUNTIME_DIR=@abs_top_builddir@/test/XDG_RUNTIME_DIR; \ $(NULL) TESTS=run-test.sh run-test-systemserver.sh |