marko10_000
/
flatpak-builder
forked from Mirrors/flatpak-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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 <withnall@endlessm.com>
tingping/wmclass
Philip Withnall 2017-08-07 14:59:43 +01:00 committed by Alexander Larsson
parent 642a5a81a1
commit 19dbbd5f8c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/Makefile.am.inc
View File

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