X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=blobdiff_plain;f=tests%2Ffilter%2Fcheck;h=7c4e6ac6119004bf174d4e20f113acb8859417bf;hp=35db4ed22c374de10ffcd1631265c40b5b8d7b67;hb=HEAD;hpb=b809edc47e57f527900230cd744352faec4411c5

diff --git a/tests/filter/check b/tests/filter/check
index 35db4ed..7c4e6ac 100755
--- a/tests/filter/check
+++ b/tests/filter/check
@@ -1,21 +1,38 @@
 #!/bin/bash
+# subdirmk - part of the test suite
+#  Copyright 2019 Mark Wooding
+#  Copyright 2019 Ian Jackson
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# There is NO WARRANTY.
+
 set -e
 set -o pipefail
 
 cd tests/filter
 
-expand <../../README | ./extract-doctest . >/dev/null
+expand <../../README | ./extract-doctests . >/dev/null
+
+set +e
+../../generate sub/dir 2>stderr.tmp
+rc=$?
+set -e
+if [ $rc != 0 ]; then cat stderr.tmp; exit 1; fi
+
+ok=true
 
-../../generate sub/dir
 files=$(find -name \*.expected)
 for f in $files; do
-	sed <$f >$f.tmp '
+	i=$f
+	o=$f.tmp
+	sed <$i >$o '
 		/^# doctests:/ {
-			r '"${f%/*}/doctest.mk.part"'
+			r '"${f%/*}/doctests.mk.part"'
 			a
 		}
 	'
-	diff -u $f.tmp ${f%.expected}.tmp
+	diff -u $f.tmp ${f%.expected}.tmp || ok=false
 done
 
+$ok
+
 echo ok.