summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tests/warn/Makefile.am9
-rwxr-xr-xtests/warn/warntestrunner8
2 files changed, 4 insertions, 13 deletions
diff --git a/tests/warn/Makefile.am b/tests/warn/Makefile.am
index bce45629..1620ae1f 100644
--- a/tests/warn/Makefile.am
+++ b/tests/warn/Makefile.am
@@ -1,8 +1,6 @@
include $(top_srcdir)/common.mk
-TESTS = warntestrunner
-
-alltests = \
+TESTS = \
annotationparser.h \
callback-invalid-scope.h \
callback-missing-scope.h \
@@ -19,6 +17,7 @@ alltests = \
unknown-parameter.h \
unresolved-type.h
-EXTRA_DIST = warningtester.py $(alltests) 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)"
+EXTRA_DIST = warningtester.py common.h $(TESTS)
diff --git a/tests/warn/warntestrunner b/tests/warn/warntestrunner
deleted file mode 100755
index d3a4e87a..00000000
--- a/tests/warn/warntestrunner
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-for testname in ${alltests}; do
- echo "Running warning test:" $testname
- $PYTHON $srcdir/warningtester.py "$srcdir/$testname"
-done