diff options
| author | Colin Walters <walters@verbum.org> | 2014-01-25 09:29:53 -0500 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2014-01-25 09:29:53 -0500 |
| commit | b366fc08ee2e85f6716a538bdb14e266e76efda4 (patch) | |
| tree | 6f5bcca96cf291dcbbae8fdca92fff7389e69870 | |
| parent | 34c141e6f28335e1ba7daab429edda09492dad97 (diff) | |
| download | gobject-introspection-b366fc08ee2e85f6716a538bdb14e266e76efda4.tar.gz | |
tests: Switch two more uses to LOG_COMPILER to fix parallel-tests
This is similar to previous commits; we need to use LOG_COMPILER in
order for Automake's parallel-tests framework to work. It's not
allowed to include binaries in TESTS_ENVIRONMENT anymore.
| -rw-r--r-- | tests/offsets/Makefile.am | 3 | ||||
| -rw-r--r-- | tests/warn/Makefile.am | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/tests/offsets/Makefile.am b/tests/offsets/Makefile.am index 34466f71..a3ec78b1 100644 --- a/tests/offsets/Makefile.am +++ b/tests/offsets/Makefile.am @@ -50,8 +50,7 @@ CLEANFILES += gitestoffsets.c $(EXTRA_PROGRAMS) # The trailing "echo" in TESTS_ENVIRONMENT is used to ignore automake passing # gitestoffsets as we already run this in the same command line. TESTS = gitestoffsets -TESTS_ENVIRONMENT = \ - GI_TYPELIB_PATH=:$(top_builddir) ./gitestoffsets$(EXEEXT) offsets.compiled offsets.introspected && \ +LOG_COMPILER = env GI_TYPELIB_PATH=:$(top_builddir) ./gitestoffsets$(EXEEXT) offsets.compiled offsets.introspected && \ diff -u offsets.compiled offsets.introspected && echo CLEANFILES += offsets.compiled offsets.introspected diff --git a/tests/warn/Makefile.am b/tests/warn/Makefile.am index 1620ae1f..e7a39345 100644 --- a/tests/warn/Makefile.am +++ b/tests/warn/Makefile.am @@ -17,7 +17,7 @@ TESTS = \ unknown-parameter.h \ unresolved-type.h -TESTS_ENVIRONMENT = PYTHONPATH=$(top_builddir):$(top_srcdir) TOP_BUILDDIR=$(top_builddir) UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \ +LOG_COMPILER = env PYTHONPATH=$(top_builddir):$(top_srcdir) TOP_BUILDDIR=$(top_builddir) UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \ $(PYTHON) $(srcdir)/warningtester.py EXTRA_DIST = warningtester.py common.h $(TESTS) |