[gobject-introspection] tests: Switch two more uses to LOG_COMPILER to fix parallel-tests



commit b366fc08ee2e85f6716a538bdb14e266e76efda4
Author: Colin Walters <walters verbum org>
Date:   Sat Jan 25 09:29:53 2014 -0500

    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.

 tests/offsets/Makefile.am |    3 +--
 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 34466f7..a3ec78b 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 1620ae1..e7a3934 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)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]