diff options
| author | Hilko Bengen <bengen@hilluzination.de> | 2012-05-23 22:51:31 +0200 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2012-06-01 19:27:05 +0100 |
| commit | 525e83abc8fa9dbd666975fe260cd31cd1843dcf (patch) | |
| tree | ce1e2c353a5b974a74d2518083361e338f0c0797 | |
| parent | 09bf144362e8f4f9dff1e1ea9bc0db273d7ffb61 (diff) | |
| download | libguestfs-525e83abc8fa9dbd666975fe260cd31cd1843dcf.tar.gz libguestfs-525e83abc8fa9dbd666975fe260cd31cd1843dcf.tar.xz libguestfs-525e83abc8fa9dbd666975fe260cd31cd1843dcf.zip | |
Split off GObject tests that require an appliance
(cherry picked from commit 3893dc0b9436ebb4dd620c6ca9b1d038eacf83a6)
| -rw-r--r-- | gobject/Makefile.am | 8 | ||||
| -rwxr-xr-x | gobject/run-live-tests | 26 | ||||
| -rwxr-xr-x | gobject/run-tests | 1 |
3 files changed, 32 insertions, 3 deletions
diff --git a/gobject/Makefile.am b/gobject/Makefile.am index f75bcf6b..02e70cba 100644 --- a/gobject/Makefile.am +++ b/gobject/Makefile.am @@ -33,7 +33,8 @@ EXTRA_DIST = \ TODO.txt \ bindtests-manual.js \ tests-misc.js \ - run-tests + run-tests \ + run-live-tests # Remove the old generated files which were directly in the gobject/ # directory. These have now moved into gobject/src/ @@ -85,10 +86,13 @@ 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): $(typelib_DATA) CLEANFILES += $(gir_DATA) $(typelib_DATA) -endif +endif HAVE_INTROSPECTION diff --git a/gobject/run-live-tests b/gobject/run-live-tests new file mode 100755 index 00000000..11e8f7b0 --- /dev/null +++ b/gobject/run-live-tests @@ -0,0 +1,26 @@ +#!/bin/sh - +# libguestfs GObject bindings +# Copyright (C) 2012 Red Hat Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +set -e + +if [ -z "$GJS" ]; then + echo "GObject bind tests skipped: gjs is missing" + exit 0 +fi + +../run $GJS $srcdir/tests-misc.js 2>/dev/null diff --git a/gobject/run-tests b/gobject/run-tests index d2ce0a60..55c489cf 100755 --- a/gobject/run-tests +++ b/gobject/run-tests @@ -26,4 +26,3 @@ fi ../run $GJS $srcdir/bindtests.js > bindtests.tmp diff -u ${srcdir}/../bindtests bindtests.tmp ../run $GJS $srcdir/bindtests-manual.js 2>/dev/null -../run $GJS $srcdir/tests-misc.js 2>/dev/null |