From 703f1daa1f296a5fad36d96db2de631cd7a4d50e Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 25 Dec 2019 15:43:38 +0000 Subject: [PATCH] doctests: Test in sub/dir too Signed-off-by: Ian Jackson --- tests/filter/main.mk.expected | 1 + tests/filter/sub/dir/Subdir.mk.expected | 3 ++- tests/filter/sub/dir/Subdir.sd.mk | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/filter/main.mk.expected b/tests/filter/main.mk.expected index 110c608..33dfe34 100644 --- 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 b0da72c..9f7cb70 100644 --- 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 792d600..f06ea99 100644 --- 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 -- 2.30.2