From 19dbbd5f8cc05362edc3f1a6b63f062b596a2400 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Mon, 7 Aug 2017 14:59:43 +0100 Subject: [PATCH] tests: Use AM_TESTS_ENVIRONMENT rather than TESTS_ENVIRONMENT The latter is reserved for the user to set in their environment. The former is what the makefile is supposed to set. See https://www.gnu.org/software/automake/manual/html_node/Scripts_002dbased-Testsuites.html. Signed-off-by: Philip Withnall --- tests/Makefile.am.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/Makefile.am.inc b/tests/Makefile.am.inc index 14250a7c..091b4ab1 100644 --- a/tests/Makefile.am.inc +++ b/tests/Makefile.am.inc @@ -1,4 +1,4 @@ -TESTS_ENVIRONMENT += FLATPAK_TESTS_DEBUG=1 \ +AM_TESTS_ENVIRONMENT = FLATPAK_TESTS_DEBUG=1 \ FLATPAK_TRIGGERSDIR=$$(cd $(top_srcdir) && pwd)/triggers \ FLATPAK_DBUSPROXY=$$(cd $(top_builddir) && pwd)/flatpak-dbus-proxy \ GI_TYPELIB_PATH=$$(cd $(top_builddir) && pwd)$${GI_TYPELIB_PATH:+:$$GI_TYPELIB_PATH} \ @@ -7,9 +7,9 @@ TESTS_ENVIRONMENT += FLATPAK_TESTS_DEBUG=1 \ $(NULL) if WITH_SYSTEM_BWRAP -TESTS_ENVIRONMENT += FLATPAK_BWRAP=$(BWRAP) +AM_TESTS_ENVIRONMENT += FLATPAK_BWRAP=$(BWRAP) else -TESTS_ENVIRONMENT += FLATPAK_BWRAP=$$(cd $(top_builddir) && pwd)/flatpak-bwrap +AM_TESTS_ENVIRONMENT += FLATPAK_BWRAP=$$(cd $(top_builddir) && pwd)/flatpak-bwrap endif testdb_CFLAGS = $(AM_CFLAGS) $(BASE_CFLAGS)