From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 24 Dec 2019 00:18:46 +0000 (+0000)
Subject: tests/filter: Add .../sub/dir
X-Git-Tag: subdirmk/0.3~115
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=commitdiff_plain;h=3820bf022300cf56d2d2e87b08c07160b630e6c5

tests/filter: Add .../sub/dir

This will let us test output which depends on the subdirectory,
which is kind of the whole point...

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

diff --git a/tests/filter/Subdir.mk.expected b/tests/filter/Subdir.mk.expected
index fe0e7aa..84f7309 100644
--- a/tests/filter/Subdir.mk.expected
+++ b/tests/filter/Subdir.mk.expected
@@ -1,5 +1,5 @@
 # autogenerated - do not edit
 # test cases for generate script
 
-all:: $(TOP_TARGETS)
+all:: $(TOP_TARGETS) sub/all
 .PHONY: all
diff --git a/tests/filter/check b/tests/filter/check
index 09b4196..2a5a8ee 100755
--- a/tests/filter/check
+++ b/tests/filter/check
@@ -2,7 +2,7 @@
 set -e
 
 cd tests/filter
-../../generate
+../../generate sub/dir
 files=$(find -name \*.expected)
 for f in $files; do diff -u $f ${f%.expected}.tmp; done
 
diff --git a/tests/filter/main.mk.expected b/tests/filter/main.mk.expected
index a5b0e9d..90073a2 100644
--- a/tests/filter/main.mk.expected
+++ b/tests/filter/main.mk.expected
@@ -4,5 +4,7 @@ abs_top_srcdir=@abs_top_srcdir@
 SUBDIRMK_MAKEFILES :=
 MAKEFILE_TEMPLATES :=
 SUBDIRMK_MAKEFILES += Subdir.mk
+SUBDIRMK_MAKEFILES += sub/dir/Subdir.mk
 MAKEFILE_TEMPLATES += ./Subdir.sd.mk
+MAKEFILE_TEMPLATES += ./sub/dir/Subdir.sd.mk
 include $(SUBDIRMK_MAKEFILES)
diff --git a/tests/filter/sub/Subdir.mk.expected b/tests/filter/sub/Subdir.mk.expected
new file mode 100644
index 0000000..f57787b
--- /dev/null
+++ b/tests/filter/sub/Subdir.mk.expected
@@ -0,0 +1,4 @@
+# autogenerated - do not edit
+
+sub/all:: $(sub_TARGETS) sub/dir/all
+.PHONY: sub/all
diff --git a/tests/filter/sub/dir/Subdir.mk.expected b/tests/filter/sub/dir/Subdir.mk.expected
new file mode 100644
index 0000000..b0da72c
--- /dev/null
+++ b/tests/filter/sub/dir/Subdir.mk.expected
@@ -0,0 +1,5 @@
+# autogenerated - do not edit
+#
+
+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
new file mode 100644
index 0000000..792d600
--- /dev/null
+++ b/tests/filter/sub/dir/Subdir.sd.mk
@@ -0,0 +1 @@
+#