Module Name: src Committed By: rillig Date: Tue Dec 14 00:38:32 UTC 2021
Modified Files: src/usr.bin/make/unit-tests: directive-include.exp directive-include.mk Log Message: tests/make: test traditional include directive To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/directive-include.exp cvs rdiff -u -r1.7 -r1.8 src/usr.bin/make/unit-tests/directive-include.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/usr.bin/make/unit-tests/directive-include.exp diff -u src/usr.bin/make/unit-tests/directive-include.exp:1.6 src/usr.bin/make/unit-tests/directive-include.exp:1.7 --- src/usr.bin/make/unit-tests/directive-include.exp:1.6 Fri Dec 3 22:48:07 2021 +++ src/usr.bin/make/unit-tests/directive-include.exp Tue Dec 14 00:38:32 2021 @@ -6,6 +6,9 @@ make: "directive-include.mk" line 25: Co make: "directive-include.mk" line 47: Could not find " make: "directive-include.mk" line 52: Unknown modifier "Z" make: "directive-include.mk" line 52: Could not find nonexistent.mk +make: "directive-include.mk" line 57: Cannot open /nonexistent +make: "directive-include.mk" line 62: Invalid line type +make: "directive-include.mk" line 65: Could not find make: Fatal errors encountered -- cannot continue make: stopped in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/directive-include.mk diff -u src/usr.bin/make/unit-tests/directive-include.mk:1.7 src/usr.bin/make/unit-tests/directive-include.mk:1.8 --- src/usr.bin/make/unit-tests/directive-include.mk:1.7 Fri Dec 3 22:48:07 2021 +++ src/usr.bin/make/unit-tests/directive-include.mk Tue Dec 14 00:38:32 2021 @@ -1,4 +1,4 @@ -# $NetBSD: directive-include.mk,v 1.7 2021/12/03 22:48:07 rillig Exp $ +# $NetBSD: directive-include.mk,v 1.8 2021/12/14 00:38:32 rillig Exp $ # # Tests for the .include directive, which includes another file. @@ -51,4 +51,17 @@ DQUOT= " # FIXME: Add proper error handling, no file must be included here. .include "nonexistent${:U123:Z}.mk" +# The traditional include directive is seldom used. +include /dev/null # comment +# expect+1: Cannot open /nonexistent +include /nonexistent # comment +sinclude /nonexistent # comment +include ${:U/dev/null} # comment +include /dev/null /dev/null +# expect+1: Invalid line type +include +# XXX: trailing whitespace in diagnostic, missing quotes around filename +# expect+1: Could not find +include ${:U} + all: