Commit bb4b586d authored by Simon McVittie's avatar Simon McVittie

Change syntax of AM_TESTS_ENVIRONMENT to what the Automake docs prefer

On closer inspection of Automake docs, this is how AM_TESTS_ENVIRONMENT
is actually meant to work; the parallel test driver is even less
compatible with the old serial test driver than I'd realised :-(

Also, according to <http://www.unix.com/man-page/POSIX/1posix/export>,
"export FOO=bar" is actually required functionality for POSIX shells,
and is not a bashism. The Autoconf documentation mentions Solaris 10
as an example of somewhere this doesn't work... but at this point
I'd prefer to say "compiling dbus requires a POSIX shell".
Reviewed-by: Philip Withnall's avatarPhilip Withnall <philip.withnall@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89846
parent 4e29ece6
...@@ -142,17 +142,18 @@ installable_test_meta_with_config = $(installable_tests:=_with_config.test) ...@@ -142,17 +142,18 @@ installable_test_meta_with_config = $(installable_tests:=_with_config.test)
installcheck_tests = installcheck_tests =
installcheck_environment = \ installcheck_environment = \
XDG_RUNTIME_DIR=@abs_top_builddir@/test/XDG_RUNTIME_DIR \ export XDG_RUNTIME_DIR=@abs_top_builddir@/test/XDG_RUNTIME_DIR; \
DBUS_TEST_DAEMON=$(DESTDIR)$(DBUS_DAEMONDIR)/dbus-daemon$(EXEEXT) \ export DBUS_TEST_DAEMON=$(DESTDIR)$(DBUS_DAEMONDIR)/dbus-daemon$(EXEEXT); \
DBUS_TEST_HOMEDIR=@abs_top_builddir@/dbus \ export DBUS_TEST_HOMEDIR=@abs_top_builddir@/dbus; \
DBUS_TEST_SYSCONFDIR=$(DESTDIR)$(sysconfdir) export DBUS_TEST_SYSCONFDIR=$(DESTDIR)$(sysconfdir); \
${NULL}
AM_TESTS_ENVIRONMENT = \ AM_TESTS_ENVIRONMENT = \
XDG_RUNTIME_DIR=@abs_top_builddir@/test/XDG_RUNTIME_DIR \ export XDG_RUNTIME_DIR=@abs_top_builddir@/test/XDG_RUNTIME_DIR; \
DBUS_FATAL_WARNINGS=1 \ export DBUS_FATAL_WARNINGS=1; \
DBUS_TEST_DAEMON=@abs_top_builddir@/bus/dbus-daemon$(EXEEXT) \ export DBUS_TEST_DAEMON=@abs_top_builddir@/bus/dbus-daemon$(EXEEXT); \
DBUS_TEST_DATA=@abs_top_builddir@/test/data \ export DBUS_TEST_DATA=@abs_top_builddir@/test/data; \
DBUS_TEST_HOMEDIR=@abs_top_builddir@/dbus \ export DBUS_TEST_HOMEDIR=@abs_top_builddir@/dbus; \
$(NULL) $(NULL)
manual_authz_SOURCES = manual-authz.c manual_authz_SOURCES = manual-authz.c
...@@ -257,11 +258,11 @@ installcheck-local: ...@@ -257,11 +258,11 @@ installcheck-local:
$(MAKE) check-TESTS TESTS='$$(installcheck_tests)' \ $(MAKE) check-TESTS TESTS='$$(installcheck_tests)' \
AM_TESTS_ENVIRONMENT='$$(installcheck_environment)' AM_TESTS_ENVIRONMENT='$$(installcheck_environment)'
if DBUS_ENABLE_INSTALLED_TESTS if DBUS_ENABLE_INSTALLED_TESTS
test -n "$(DESTDIR)" || \ test -n "$(DESTDIR)" || { \
$(installcheck_environment) \ $(installcheck_environment) \
$(srcdir)/dbus-test-runner \ $(srcdir)/dbus-test-runner \
$(testexecdir) \ $(testexecdir) \
$(testexec_PROGRAMS) $(testexec_PROGRAMS) }
endif DBUS_ENABLE_INSTALLED_TESTS endif DBUS_ENABLE_INSTALLED_TESTS
in_data = \ in_data = \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment