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 fe0e7aab800d1d45070b2bc59a2253744939af3d..84f73093d02ce6ee1d53fbc911255539b1674ef8 100644 (file)
--- 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
 
 # autogenerated - do not edit
 # test cases for generate script
 

-all:: $(TOP_TARGETS)
+all:: $(TOP_TARGETS) sub/all

 .PHONY: all
 .PHONY: all

diff --git a/tests/filter/check b/tests/filter/check
index 09b4196e1d5d6539d41dc2e2b5e56a03fa0a5cff..2a5a8ee1d9be97df9dafe0531c6e7af7786e50d8 100755 (executable)
--- a/tests/filter/check
+++ b/tests/filter/check
@@ -2,7 +2,7 @@
 set -e
 
 cd tests/filter
 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
 
 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 a5b0e9d0e5abd8c6be9be894d5056f44a7ae2bd2..90073a2712a0deddcb8ea7feed95920985c10c74 100644 (file)
--- 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 :=
 MAKEFILE_TEMPLATES :=
 SUBDIRMK_MAKEFILES += Subdir.mk

+SUBDIRMK_MAKEFILES += sub/dir/Subdir.mk

 MAKEFILE_TEMPLATES += ./Subdir.sd.mk
 MAKEFILE_TEMPLATES += ./Subdir.sd.mk

+MAKEFILE_TEMPLATES += ./sub/dir/Subdir.sd.mk

 include $(SUBDIRMK_MAKEFILES)
 include $(SUBDIRMK_MAKEFILES)

diff --git a/tests/filter/sub/Subdir.mk.expected b/tests/filter/sub/Subdir.mk.expected
new file mode 100644 (file)
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 (file)
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 (file)
index 0000000..792d600
--- /dev/null
+++ b/tests/filter/sub/dir/Subdir.sd.mk
@@ -0,0 +1 @@
+#