Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
rillig 2020-05-17 12:36:26 +00:00
parent 8d5e5064ef
commit 08808cd251
6 changed files with 67 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
distrib/sets/lists/tests/mi
View File

@ -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

3
usr.bin/make/unit-tests/Makefile
View File

@ -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 @@ TESTNAMES= \
forloop \
forsubst \
hash \
include-main \
misc \
moderrs \
modmatch \

6
usr.bin/make/unit-tests/include-main.exp Normal file
View File

@ -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

30
usr.bin/make/unit-tests/include-main.mk Normal file
View File

@ -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}

17
usr.bin/make/unit-tests/include-sub.mk Normal file
View File

@ -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

7
usr.bin/make/unit-tests/include-subsub.mk Normal file
View File

@ -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