gobject: Use run --test for tests, and set GJS in run script.

This commit is contained in:
Richard W.M. Jones
2012-06-28 13:34:52 +01:00
parent 2d56e5af90
commit 1b56aedc2b
4 changed files with 7 additions and 4 deletions

View File

@@ -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)

View File

@@ -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

View File

@@ -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

1
run.in
View File

@@ -72,6 +72,7 @@ fi
export PYTHONPATH
# For GObject and friends.
export GJS=@GJS@
if [ -z "$GI_TYPELIB_PATH" ]; then
GI_TYPELIB_PATH="$b/gobject"
else