doctests: Test in sub/dir too

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

diff --git a/tests/filter/main.mk.expected b/tests/filter/main.mk.expected
index 110c60880a2815c2c2bc6ec2179058c4a5452488..33dfe3433771e7582874e24f5d6823105cf12670 100644 (file)
--- a/tests/filter/main.mk.expected
+++ b/tests/filter/main.mk.expected
@@ -9,4 +9,5 @@ SUBDIRMK_MAKEFILES += sub/dir/Subdir.mk
 MAKEFILE_TEMPLATES += ./Subdir.sd.mk
 MAKEFILE_TEMPLATES += ./doctest.sd.mk
 MAKEFILE_TEMPLATES += ./sub/dir/Subdir.sd.mk
+MAKEFILE_TEMPLATES += ./sub/dir/doctest.sd.mk
 include $(SUBDIRMK_MAKEFILES)

diff --git a/tests/filter/sub/dir/Subdir.mk.expected b/tests/filter/sub/dir/Subdir.mk.expected
index b0da72c1bccf8394c307003ed1e22f40796753a9..9f7cb70f8223ddfd7a2866bea11b82f98a440396 100644 (file)
--- a/tests/filter/sub/dir/Subdir.mk.expected
+++ b/tests/filter/sub/dir/Subdir.mk.expected
@@ -1,5 +1,6 @@
 # autogenerated - do not edit
-#
+# subdirectory test cases
+# doctests:
 
 sub/dir/all:: $(sub_dir_TARGETS)
 .PHONY: sub/dir/all

diff --git a/tests/filter/sub/dir/Subdir.sd.mk b/tests/filter/sub/dir/Subdir.sd.mk
index 792d6005489ebee62cde02066f19c5521e620451..f06ea993f340b3595e38eded839e63f87ceeb972 100644 (file)
--- a/tests/filter/sub/dir/Subdir.sd.mk
+++ b/tests/filter/sub/dir/Subdir.sd.mk
@@ -1 +1,3 @@
-#
+# subdirectory test cases
+# doctests:
+&:include &doctest.sd.mk