From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 1 Apr 2015 12:07:36 +0000 (+0100)
Subject: name-test: also switch to AM_TESTS_ENVIRONMENT here
X-Git-Tag: dbus-1.9.16~51
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=46e2759883ba308284176068a653b0af4536de30;p=thirdparty%2Fdbus.git

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
---

diff --git a/test/name-test/Makefile.am b/test/name-test/Makefile.am
index c6611aa37..ad637ecd1 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