From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 28 Dec 2019 11:34:56 +0000 (+0000)
Subject: tests/filter: Rename `doctest' -> `doctests' everywhere
X-Git-Tag: subdirmk/0.3~42
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=commitdiff_plain;h=edfd1e8c3b5d8dd10e9b9ebb530d86e670d441d2

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 abeb274..37852cf 100644
--- 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 3ef02b3..c627263 100644
--- 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 5ba1a23..a63d20b 100755
--- 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 d779e00..707da89 100755
--- 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 58a3024..9b4931c 100644
--- 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 0cba54a..556d671 100644
--- 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 18c53cf..d21ea73 100755
--- 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;
 	' \