tests/filter: Rename `doctest' -> `doctests' everywhere

This is more uniform.  A lot of churn, though.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/tests/filter/.gitignore b/tests/filter/.gitignore
index abeb2745dcb75aab487c82bff9d0fc4219e95f1b..37852cfbde9be689a2aa8a49ce1c17130f0a9f89 100644 (file)
--- a/tests/filter/.gitignore
+++ b/tests/filter/.gitignore
@@ -1,4 +1,4 @@
 Makefile
 *.tmp
-doctest.sd.mk
-doctest.mk.part
+doctests.sd.mk
+doctests.mk.part

diff --git a/tests/filter/Dir.sd.mk b/tests/filter/Dir.sd.mk
index 3ef02b340e53429cf34af346a0a23d6b2794a0f9..c6272639b47d8c7784058ad971dce00ca759ba21 100644 (file)
--- a/tests/filter/Dir.sd.mk
+++ b/tests/filter/Dir.sd.mk
@@ -1,3 +1,3 @@
 # test cases for generate script
 # doctests:
-&:include &doctest.sd.mk
+&:include &doctests.sd.mk

diff --git a/tests/filter/check b/tests/filter/check
index 5ba1a231a56dbc7bcec056a1b5a91cfb8387e34c..a63d20b1de5997c9e97a96483724604e7e84809a 100755 (executable)
--- a/tests/filter/check
+++ b/tests/filter/check
@@ -4,7 +4,7 @@ set -o pipefail
 
 cd tests/filter
 
-expand <../../README | ./extract-doctest . >/dev/null
+expand <../../README | ./extract-doctests . >/dev/null
 
 ../../generate sub/dir
 files=$(find -name \*.expected)
@@ -13,7 +13,7 @@ for f in $files; do
        o=$f.tmp
        sed <$i >$o '
                /^# doctests:/ {
-                       r '"${f%/*}/doctest.mk.part"'
+                       r '"${f%/*}/doctests.mk.part"'
                        a
                }
        '

diff --git a/tests/filter/extract-doctest b/tests/filter/extract-doctests
similarity index 92%
rename from tests/filter/extract-doctest
rename to tests/filter/extract-doctests
index d779e00a5da4c152f9e55146a7c16b05f483c87c..707da89fbaec7438902cdf8634075e9cdbdcbb8a 100755 (executable)
--- a/tests/filter/extract-doctest
+++ b/tests/filter/extract-doctests
@@ -3,10 +3,10 @@
 # script for extracting doctests from README
 #
 # usage:
-#   expand <README | tests/filter/extract-doctest tests/filter/
+#   expand <README | tests/filter/extract-doctests tests/filter/
 # writes:
-#   tests/filter/doctest.mk.part
-#   tests/filter/sub/dir/doctest.mk.part
+#   tests/filter/doctests.mk.part
+#   tests/filter/sub/dir/doctests.mk.part
 #
 # Relies on some properties of the way README is laid out.
 # See comments below marked `parse:' and `adhoc:'.
@@ -130,9 +130,9 @@ sub write_permode ($$$$$;$$) {
     
 sub writeout ($) {
     my ($dir_prefix) = @_;
-    open I, '>', "$outdir/${dir_prefix}doctest.sd.mk" or die $!;
-    open O, '>', "$outdir/${dir_prefix}doctest.mk.part" or die $!;
-    oh "# doctest starts $dir_prefix\n";
+    open I, '>', "$outdir/${dir_prefix}doctests.sd.mk" or die $!;
+    open O, '>', "$outdir/${dir_prefix}doctests.mk.part" or die $!;
+    oh "# doctests start $dir_prefix\n";
     write_permode($dir_prefix,
                  '','','', 'normal',
                 sub { !$_[0]{DD} && !$_[0]{CQ} } );
@@ -165,7 +165,7 @@ sub writeout ($) {
                  "",
                  'changequote',
                  sub { $_[0]{CQ} } );
-    oh "# doctest ends\n";
+    oh "# doctests end\n";
     close I or die $!;
 }
 

diff --git a/tests/filter/main.mk.expected b/tests/filter/main.mk.expected
index 58a3024815653b10d90f0759ec216d79b514506e..9b4931ca0ff6926c9d35fbb8cdc05d7402b4dad3 100644 (file)
--- a/tests/filter/main.mk.expected
+++ b/tests/filter/main.mk.expected
@@ -11,7 +11,7 @@ MAKEFILE_TEMPLATES += ./Dir.sd.mk
 MAKEFILE_TEMPLATES += ./Final.sd.mk
 MAKEFILE_TEMPLATES += ./Prefix.sd.mk
 MAKEFILE_TEMPLATES += ./Suffix.sd.mk
-MAKEFILE_TEMPLATES += ./doctest.sd.mk
+MAKEFILE_TEMPLATES += ./doctests.sd.mk
 MAKEFILE_TEMPLATES += ./sub/dir/Dir.sd.mk
-MAKEFILE_TEMPLATES += ./sub/dir/doctest.sd.mk
+MAKEFILE_TEMPLATES += ./sub/dir/doctests.sd.mk
 include $(SUBDIRMK_MAKEFILES)

diff --git a/tests/filter/sub/dir/Dir.sd.mk b/tests/filter/sub/dir/Dir.sd.mk
index 0cba54a517518b95877fae750b8b9ae4d676b592..556d671250d3ddedf120817a4a074665d61cf636 100644 (file)
--- a/tests/filter/sub/dir/Dir.sd.mk
+++ b/tests/filter/sub/dir/Dir.sd.mk
@@ -11,4 +11,4 @@ line &\
 joining
 
 # doctests:
-&:include &doctest.sd.mk
+&:include &doctests.sd.mk

diff --git a/tests/filter/update-expected b/tests/filter/update-expected
index 18c53cff4cfdf15d6f925f0b6cf55d4151e6c970..d21ea73374f4fa319ec61dd66f3f9eb9b59d54b7 100755 (executable)
--- a/tests/filter/update-expected
+++ b/tests/filter/update-expected
@@ -10,7 +10,7 @@ files=$(find tests/filter -name \*.expected.tmp)
 for f in $files; do
        perl -pe '
                (s/\n//, $stripnl=0) if $stripnl;
-               next unless /^# doctest starts/../^# doctest ends/;
+               next unless /^# doctests start/../^# doctests end/;
                $_="";
                $stripnl=1;
        ' \