[src/trunk]: src/usr.bin/make/unit-tests usr.bin/make: demonstrate actual beh...

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/55e9c6fdb4e2
branches:  trunk
changeset: 1010185:55e9c6fdb4e2
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sun May 17 12:36:26 2020 +0000

description:
usr.bin/make: demonstrate actual behavior of .INCLUDEDFROMFILE

diffstat:

 distrib/sets/lists/tests/mi               |   6 +++++-
 usr.bin/make/unit-tests/Makefile          |   3 ++-
 usr.bin/make/unit-tests/include-main.exp  |   6 ++++++
 usr.bin/make/unit-tests/include-main.mk   |  30 ++++++++++++++++++++++++++++++
 usr.bin/make/unit-tests/include-sub.mk    |  17 +++++++++++++++++
 usr.bin/make/unit-tests/include-subsub.mk |   7 +++++++
 6 files changed, 67 insertions(+), 2 deletions(-)

diffs (113 lines):

diff -r fe77fa78adbf -r 55e9c6fdb4e2 distrib/sets/lists/tests/mi
--- a/distrib/sets/lists/tests/mi       Sun May 17 12:11:11 2020 +0000
+++ b/distrib/sets/lists/tests/mi       Sun May 17 12:36:26 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.840 2020/05/10 12:34:01 rillig Exp $
+# $NetBSD: mi,v 1.841 2020/05/17 12:36:26 rillig Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -4493,6 +4493,10 @@
 ./usr/tests/usr.bin/make/unit-tests/hash.mk    tests-usr.bin-tests     compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/impsrc.exp tests-usr.bin-tests     compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/impsrc.mk  tests-usr.bin-tests     compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/include-main.exp   tests-usr.bin-tests     compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/include-main.mk    tests-usr.bin-tests     compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/include-sub.mk     tests-usr.bin-tests     compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/include-subsub.mk  tests-usr.bin-tests     compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/misc.exp   tests-usr.bin-tests     compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/misc.mk    tests-usr.bin-tests     compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/moderrs.exp        tests-usr.bin-tests     compattestfile,atf
diff -r fe77fa78adbf -r 55e9c6fdb4e2 usr.bin/make/unit-tests/Makefile
--- a/usr.bin/make/unit-tests/Makefile  Sun May 17 12:11:11 2020 +0000
+++ b/usr.bin/make/unit-tests/Makefile  Sun May 17 12:36:26 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2020/05/10 12:42:11 rillig Exp $
+# $NetBSD: Makefile,v 1.58 2020/05/17 12:36:26 rillig Exp $
 #
 # Unit tests for make(1)
 # The main targets are:
@@ -35,6 +35,7 @@
        forloop \
        forsubst \
        hash \
+       include-main \
        misc \
        moderrs \
        modmatch \
diff -r fe77fa78adbf -r 55e9c6fdb4e2 usr.bin/make/unit-tests/include-main.exp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/usr.bin/make/unit-tests/include-main.exp  Sun May 17 12:36:26 2020 +0000
@@ -0,0 +1,6 @@
+main-before-ok
+sub-before-ok
+subsub-ok
+sub-after-fail(include-sub.mk)
+main-after-fail(include-sub.mk)
+exit status 0
diff -r fe77fa78adbf -r 55e9c6fdb4e2 usr.bin/make/unit-tests/include-main.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/usr.bin/make/unit-tests/include-main.mk   Sun May 17 12:36:26 2020 +0000
@@ -0,0 +1,30 @@
+# $NetBSD: include-main.mk,v 1.1 2020/05/17 12:36:26 rillig Exp $
+#
+# Demonstrates that the .INCLUDEDFROMFILE magic variable does not behave
+# as described in the manual page.
+#
+# The manual page says that it is the "filename of the file this Makefile
+# was included from", while in reality it is the "filename in which the
+# latest .include happened".
+#
+
+.if !defined(.INCLUDEDFROMFILE)
+LOG+=          main-before-ok
+.else
+.  for f in ${.INCLUDEDFROMFILE}
+LOG+=          main-before-fail\(${f:Q}\)
+.  endfor
+.endif
+
+.include "include-sub.mk"
+
+.if !defined(.INCLUDEDFROMFILE)
+LOG+=          main-after-ok
+.else
+.  for f in ${.INCLUDEDFROMFILE}
+LOG+=          main-after-fail\(${f:Q}\)
+.  endfor
+.endif
+
+all:
+       @printf '%s\n' ${LOG}
diff -r fe77fa78adbf -r 55e9c6fdb4e2 usr.bin/make/unit-tests/include-sub.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/usr.bin/make/unit-tests/include-sub.mk    Sun May 17 12:36:26 2020 +0000
@@ -0,0 +1,17 @@
+# $NetBSD: include-sub.mk,v 1.1 2020/05/17 12:36:26 rillig Exp $
+
+.if ${.INCLUDEDFROMFILE} == "include-main.mk"
+LOG+=          sub-before-ok
+.else
+LOG+=          sub-before-fail
+.endif
+
+.include "include-subsub.mk"
+
+.if ${.INCLUDEDFROMFILE} == "include-main.mk"
+LOG+=          sub-after-ok
+.else
+.  for f in ${.INCLUDEDFROMFILE}
+LOG+=          sub-after-fail\(${f:Q}\)
+.  endfor
+.endif
diff -r fe77fa78adbf -r 55e9c6fdb4e2 usr.bin/make/unit-tests/include-subsub.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/usr.bin/make/unit-tests/include-subsub.mk Sun May 17 12:36:26 2020 +0000
@@ -0,0 +1,7 @@
+# $NetBSD: include-subsub.mk,v 1.1 2020/05/17 12:36:26 rillig Exp $
+
+.if ${.INCLUDEDFROMFILE:T} == "include-sub.mk"
+LOG+=          subsub-ok
+.else
+LOG+=          subsub-fail
+.endif