From 1b56aedc2b68a2db1e98c68d5344247742909e2e Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 28 Jun 2012 13:34:52 +0100
Subject: gobject: Use run --test for tests, and set GJS in run script.

---
 gobject/Makefile.am    | 4 +++-
 gobject/run-live-tests | 2 +-
 gobject/run-tests      | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'gobject')

diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index 02e70cba..2d5c2a65 100644
--- a/gobject/Makefile.am
+++ b/gobject/Makefile.am
@@ -86,10 +86,12 @@ typelibdir = $(libdir)/girepository-1.0
 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
 TESTS = run-tests
+
 if ENABLE_APPLIANCE
 TESTS += run-live-tests
 endif ENABLE_APPLIANCE
-TESTS_ENVIRONMENT = GJS=$(GJS)
+
+TESTS_ENVIRONMENT = $(top_builddir)/run --test
 
 $(TESTS): $(typelib_DATA)
 
diff --git a/gobject/run-live-tests b/gobject/run-live-tests
index 11e8f7b0..3f3648e2 100755
--- a/gobject/run-live-tests
+++ b/gobject/run-live-tests
@@ -23,4 +23,4 @@ if [ -z "$GJS" ]; then
   exit 0
 fi
 
-../run $GJS $srcdir/tests-misc.js 2>/dev/null
+$GJS $srcdir/tests-misc.js 2>/dev/null
diff --git a/gobject/run-tests b/gobject/run-tests
index 55c489cf..014f646e 100755
--- a/gobject/run-tests
+++ b/gobject/run-tests
@@ -23,6 +23,6 @@ if [ -z "$GJS" ]; then
   exit 0
 fi
 
-../run $GJS $srcdir/bindtests.js > bindtests.tmp
+$GJS $srcdir/bindtests.js > bindtests.tmp
 diff -u ${srcdir}/../bindtests bindtests.tmp
-../run $GJS $srcdir/bindtests-manual.js 2>/dev/null
+$GJS $srcdir/bindtests-manual.js 2>/dev/null
-- 
cgit