[gobject-introspection] tests: Update GI to use parallel test harness

[Simon Feltman <sfeltman src gnome org>]

commit 512111b007a684886f287b5b0fdff678969971d2
Author: Simon Feltman <sfeltman src gnome org>
Date:   Sat Jan 4 12:14:41 2014 -0800

    tests: Update GI to use parallel test harness
    
    There was some dependence on the serial test harness in the recent tests
    that were added. Update GI to use the parallel test harness to avoid
    incompatibilities.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=721477

 configure.ac                               |    2 +-
 tests/Makefile.am                          |    3 +--
 tests/gi-tester                            |    2 +-
 tests/scanner/Makefile.am                  |    4 ++--
 tests/scanner/annotationparser/Makefile.am |    4 ++--
 5 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f60d3f4..a01d630 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 parallel-tests])
 AM_MAINTAINER_MODE([enable])
 
 AM_SILENT_RULES([yes])
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 877c2fc..26b5910 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -67,5 +67,4 @@ GIMarshallingTests-1.0.gir: libgimarshallingtests-1.0.la Makefile
        $(AM_V_GEN) $(INTROSPECTION_COMPILER) $(INTROSPECTION_COMPILER_ARGS) $< -o $@
 
 TESTS=Everything-1.0.typelib GIMarshallingTests-1.0.typelib
-TESTS_ENVIRONMENT=$(srcdir)/gi-tester
-
+LOG_COMPILER=$(srcdir)/gi-tester
diff --git a/tests/gi-tester b/tests/gi-tester
index a7be690..6f31a0d 100755
--- a/tests/gi-tester
+++ b/tests/gi-tester
@@ -47,7 +47,7 @@ case $targetname in
     fi
     ;;
 *)
-    echo $"Usage: [TESTARGS=<args>] gi-tester <targetname>"
+    echo $"Usage: [TESTARGS=<args>] gi-tester <targetname>" $1
     exit 1
     ;;
 esac
diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am
index 999116d..7a154b3 100644
--- a/tests/scanner/Makefile.am
+++ b/tests/scanner/Makefile.am
@@ -199,8 +199,8 @@ PYTESTS = \
 XFAIL_TESTS = Typedefs-1.0.gir
 TESTS = Headeronly-1.0.gir $(CHECKGIRS) $(CHECKDOCS) $(TYPELIBS) $(PYTESTS)
 TESTS_ENVIRONMENT = srcdir=$(srcdir) top_srcdir=$(top_srcdir) builddir=$(builddir) 
top_builddir=$(top_builddir) \
-       PYTHON=$(PYTHON) UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \
-       $(top_srcdir)/tests/gi-tester
+       PYTHON=$(PYTHON) UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir)
+LOG_COMPILER = $(top_srcdir)/tests/gi-tester
 
 EXTRA_DIST += \
        $(PYTESTS) \
diff --git a/tests/scanner/annotationparser/Makefile.am b/tests/scanner/annotationparser/Makefile.am
index 1a65125..3003df8 100644
--- a/tests/scanner/annotationparser/Makefile.am
+++ b/tests/scanner/annotationparser/Makefile.am
@@ -5,8 +5,8 @@ TESTS = \
        test_patterns.py
 
 TESTS_ENVIRONMENT = builddir=$(builddir) top_builddir=$(top_builddir) srcdir=$(srcdir) 
top_srcdir=$(top_srcdir) \
-       PYTHON=$(PYTHON) UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \
-       $(top_srcdir)/tests/gi-tester
+       PYTHON=$(PYTHON) UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir)
+LOG_COMPILER = $(top_srcdir)/tests/gi-tester
 
 EXTRA_DIST = \
        $(TESTS)                                \