summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2013-02-19 17:56:32 -0500
committerColin Walters <walters@verbum.org>2013-02-19 17:56:32 -0500
commit3e976212bfd34a675632c5a0aecc9f8070df8098 (patch)
tree7f5ed9d0249c6e26afe0dcfec6e7ee03de0e6be4
parent81c65f22e124c7aa53686519776714c8fdbf8bc2 (diff)
downloadgobject-introspection-3e976212bfd34a675632c5a0aecc9f8070df8098.tar.gz
tests: Be compatible with Automake 1.11, 1.12 and 1.13, and the future, hopefully
Automake only sees it as one test now, but eh, who cares. https://bugzilla.gnome.org/show_bug.cgi?id=694198
-rw-r--r--configure.ac2
-rw-r--r--tests/warn/Makefile.am8
-rwxr-xr-xtests/warn/warntestrunner8
3 files changed, 14 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 5adffdd6..83e86aec 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 serial-tests])
+AM_INIT_AUTOMAKE([1.11 tar-ustar dist-xz no-dist-gzip foreign -Wno-portability])
AM_MAINTAINER_MODE([enable])
AM_SILENT_RULES([yes])
diff --git a/tests/warn/Makefile.am b/tests/warn/Makefile.am
index c4354223..50e5ab15 100644
--- a/tests/warn/Makefile.am
+++ b/tests/warn/Makefile.am
@@ -1,6 +1,8 @@
include $(top_srcdir)/common.mk
-TESTS = \
+TESTS = warntestrunner
+
+alltests = \
annotationparser.h \
callback-invalid-scope.h \
callback-missing-scope.h \
@@ -17,6 +19,6 @@ TESTS = \
unknown-parameter.h \
unresolved-type.h
-EXTRA_DIST = warningtester.py common.h $(TESTS)
+EXTRA_DIST = warningtester.py warntestrunner common.h $(TESTS)
-TESTS_ENVIRONMENT = PYTHONPATH=$(top_builddir):$(top_srcdir) TOP_BUILDDIR=$(top_builddir) UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) $(PYTHON) $(srcdir)/warningtester.py
+TESTS_ENVIRONMENT = PYTHONPATH=$(top_builddir):$(top_srcdir) TOP_BUILDDIR=$(top_builddir) UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) PYTHON=$(PYTHON) srcdir=$(srcdir) alltests="$(alltests)"
diff --git a/tests/warn/warntestrunner b/tests/warn/warntestrunner
new file mode 100755
index 00000000..3deb3814
--- /dev/null
+++ b/tests/warn/warntestrunner
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+set -e
+
+for testname in ${alltests}; do
+ echo "Running warning test:" $testname
+ $PYTHON $srcdir/warningtester.py "$testname"
+done