diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-04-01 13:07:19 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-04-16 13:06:21 +0100 |
| commit | bb4b586d7cea7270a303a3c845979fdeb694f905 (patch) | |
| tree | c4c1d6689b2495e44734a2584b6393b1d6ba4df5 | |
| parent | 4e29ece664d5ac8078d95ba97bedc1d5f102940b (diff) | |
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 <philip.withnall@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89846
| -rw-r--r-- | test/Makefile.am | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index b1ed5c9e..2ed90505 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -142,17 +142,18 @@ installable_test_meta_with_config = $(installable_tests:=_with_config.test) installcheck_tests = installcheck_environment = \ - XDG_RUNTIME_DIR=@abs_top_builddir@/test/XDG_RUNTIME_DIR \ - DBUS_TEST_DAEMON=$(DESTDIR)$(DBUS_DAEMONDIR)/dbus-daemon$(EXEEXT) \ - DBUS_TEST_HOMEDIR=@abs_top_builddir@/dbus \ - DBUS_TEST_SYSCONFDIR=$(DESTDIR)$(sysconfdir) + export XDG_RUNTIME_DIR=@abs_top_builddir@/test/XDG_RUNTIME_DIR; \ + export DBUS_TEST_DAEMON=$(DESTDIR)$(DBUS_DAEMONDIR)/dbus-daemon$(EXEEXT); \ + export DBUS_TEST_HOMEDIR=@abs_top_builddir@/dbus; \ + export DBUS_TEST_SYSCONFDIR=$(DESTDIR)$(sysconfdir); \ + ${NULL} AM_TESTS_ENVIRONMENT = \ - XDG_RUNTIME_DIR=@abs_top_builddir@/test/XDG_RUNTIME_DIR \ - DBUS_FATAL_WARNINGS=1 \ - DBUS_TEST_DAEMON=@abs_top_builddir@/bus/dbus-daemon$(EXEEXT) \ - DBUS_TEST_DATA=@abs_top_builddir@/test/data \ - DBUS_TEST_HOMEDIR=@abs_top_builddir@/dbus \ + export XDG_RUNTIME_DIR=@abs_top_builddir@/test/XDG_RUNTIME_DIR; \ + export DBUS_FATAL_WARNINGS=1; \ + export DBUS_TEST_DAEMON=@abs_top_builddir@/bus/dbus-daemon$(EXEEXT); \ + export DBUS_TEST_DATA=@abs_top_builddir@/test/data; \ + export DBUS_TEST_HOMEDIR=@abs_top_builddir@/dbus; \ $(NULL) manual_authz_SOURCES = manual-authz.c @@ -257,11 +258,11 @@ installcheck-local: $(MAKE) check-TESTS TESTS='$$(installcheck_tests)' \ AM_TESTS_ENVIRONMENT='$$(installcheck_environment)' if DBUS_ENABLE_INSTALLED_TESTS - test -n "$(DESTDIR)" || \ + test -n "$(DESTDIR)" || { \ $(installcheck_environment) \ $(srcdir)/dbus-test-runner \ $(testexecdir) \ - $(testexec_PROGRAMS) + $(testexec_PROGRAMS) } endif DBUS_ENABLE_INSTALLED_TESTS in_data = \ |