diff options
| author | Simon McVittie <smcv@debian.org> | 2015-12-05 15:40:52 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2015-12-05 15:40:52 +0000 |
| commit | f8479140d228d7d5043069a0e966e9d3bf94e341 (patch) | |
| tree | 2599996c18bd8d677d771af57cee93a44eafb435 | |
| parent | 6e4ebe32f0f14aceb91011e422eb232e8dd21d4f (diff) | |
Update build system for Automake 1.13 (parallel test driver)
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | test/Makefile.am | 16 |
2 files changed, 10 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 3b7d76b..43d0c8b 100644 --- a/configure.ac +++ b/configure.ac @@ -31,7 +31,7 @@ AC_SUBST(DBUS_PYTHON_MICRO_VERSION, dbus_python_micro_version) AC_CONFIG_SRCDIR([_dbus_bindings/module.c]) AC_CONFIG_HEADERS(config.h) -AM_INIT_AUTOMAKE([1.9 -Wno-portability]) +AM_INIT_AUTOMAKE([1.13 -Wno-portability subdir-objects tar-ustar]) AC_CANONICAL_BUILD AC_CANONICAL_HOST diff --git a/test/Makefile.am b/test/Makefile.am index e9f9016..f4bc6e5 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -33,11 +33,13 @@ dbus_py_test_la_LDFLAGS = -module -avoid-version \ dbus_py_test_la_SOURCES = dbus_py_test.c \ $(top_srcdir)/include/dbus-python.h -TESTS_ENVIRONMENT = DBUS_TOP_SRCDIR="$(abs_top_srcdir)" \ - DBUS_TOP_BUILDDIR="$(abs_top_builddir)" \ - DBUS_PYTHON_VERSION='$(PACKAGE_VERSION)' \ - PYTHONPATH="$(abs_top_builddir)/test/.libs:$(abs_top_srcdir):$(abs_top_srcdir)/test:$(abs_top_builddir)/_dbus_bindings/.libs:$(abs_top_builddir)/_dbus_glib_bindings/.libs" \ - PYTHON='$(PYTHON)' +AM_TESTS_ENVIRONMENT = \ + export DBUS_TOP_SRCDIR="$(abs_top_srcdir)"; \ + export DBUS_TOP_BUILDDIR="$(abs_top_builddir)"; \ + export DBUS_PYTHON_VERSION='$(PACKAGE_VERSION)'; \ + export PYTHONPATH="$(abs_top_builddir)/test/.libs:$(abs_top_srcdir):$(abs_top_srcdir)/test:$(abs_top_builddir)/_dbus_bindings/.libs:$(abs_top_builddir)/_dbus_glib_bindings/.libs"; \ + export PYTHON='$(PYTHON)'; \ + $(NULL) TESTS = run-test.sh test-import-repeatedly @@ -48,8 +50,8 @@ test_import_repeatedly_CPPFLAGS = $(PYTHON_INCLUDES) test_import_repeatedly_LDFLAGS = $(PYTHON_LIBS) cross-test-server: - $(TESTS_ENVIRONMENT) $(PYTHON) $(top_srcdir)/test/cross-test-server.py + $(AM_TESTS_ENVIRONMENT) $(PYTHON) $(top_srcdir)/test/cross-test-server.py cross-test-client: - $(TESTS_ENVIRONMENT) $(PYTHON) $(top_srcdir)/test/cross-test-client.py + $(AM_TESTS_ENVIRONMENT) $(PYTHON) $(top_srcdir)/test/cross-test-client.py .PHONY: cross-test-compile cross-test-server cross-test-client |