diff options
| author | Colin Walters <walters@verbum.org> | 2013-02-19 11:53:18 -0500 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2013-02-19 11:53:18 -0500 |
| commit | 81c65f22e124c7aa53686519776714c8fdbf8bc2 (patch) | |
| tree | e71456b2e87d1b5482572cbe0192a20df459618d | |
| parent | dd81e51bd155a7fd8ee0150b4ecb33d16f54ad91 (diff) | |
| download | gobject-introspection-81c65f22e124c7aa53686519776714c8fdbf8bc2.tar.gz | |
tests: Be compatible with both Automake 1.12 and 1.13
Revert to using the serial test driver, as that's the easiest path for
now, unless we generated a binary to run each warn test.
https://bugzilla.gnome.org/693539
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | tests/warn/Makefile.am | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 83e86aec..5adffdd6 100644 --- a/configure.ac +++ b/configure.ac @@ -17,7 +17,7 @@ AC_CONFIG_HEADER([config.h]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) -AM_INIT_AUTOMAKE([1.11 tar-ustar dist-xz no-dist-gzip foreign -Wno-portability]) +AM_INIT_AUTOMAKE([1.11 tar-ustar dist-xz no-dist-gzip foreign -Wno-portability serial-tests]) AM_MAINTAINER_MODE([enable]) AM_SILENT_RULES([yes]) diff --git a/tests/warn/Makefile.am b/tests/warn/Makefile.am index 80702300..c4354223 100644 --- a/tests/warn/Makefile.am +++ b/tests/warn/Makefile.am @@ -19,5 +19,4 @@ TESTS = \ EXTRA_DIST = warningtester.py common.h $(TESTS) -TESTS_ENVIRONMENT = PYTHONPATH=$(top_builddir):$(top_srcdir) TOP_BUILDDIR=$(top_builddir) UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) -LOG_COMPILER = $(PYTHON) $(srcdir)/warningtester.py +TESTS_ENVIRONMENT = PYTHONPATH=$(top_builddir):$(top_srcdir) TOP_BUILDDIR=$(top_builddir) UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) $(PYTHON) $(srcdir)/warningtester.py |