Module Name: src
Committed By: rillig
Date: Sat Oct 24 08:34:59 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: cond1.mk doterror.mk error.mk escape.mk
export-all.mk export-env.mk export.mk forloop.mk forsubst.mk
moderrs.mk modmisc.mk modts.mk modword.mk phony-end.mk posix.mk
qequals.mk sunshcmd.mk sysv.mk ternary.mk unexport-env.mk
unexport.mk varcmd.mk varmisc.mk varshell.mk
Log Message:
make(1): use consistent RCS Id in test files
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/cond1.mk \
src/usr.bin/make/unit-tests/doterror.mk \
src/usr.bin/make/unit-tests/error.mk \
src/usr.bin/make/unit-tests/forsubst.mk \
src/usr.bin/make/unit-tests/modword.mk \
src/usr.bin/make/unit-tests/phony-end.mk \
src/usr.bin/make/unit-tests/posix.mk \
src/usr.bin/make/unit-tests/qequals.mk \
src/usr.bin/make/unit-tests/sunshcmd.mk \
src/usr.bin/make/unit-tests/ternary.mk
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/make/unit-tests/escape.mk
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/export-all.mk \
src/usr.bin/make/unit-tests/forloop.mk \
src/usr.bin/make/unit-tests/unexport.mk \
src/usr.bin/make/unit-tests/varcmd.mk
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/export-env.mk \
src/usr.bin/make/unit-tests/unexport-env.mk \
src/usr.bin/make/unit-tests/varshell.mk
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/make/unit-tests/export.mk
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/make/unit-tests/moderrs.mk
cvs rdiff -u -r1.46 -r1.47 src/usr.bin/make/unit-tests/modmisc.mk
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/make/unit-tests/modts.mk
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/make/unit-tests/sysv.mk
cvs rdiff -u -r1.23 -r1.24 src/usr.bin/make/unit-tests/varmisc.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/cond1.mk
diff -u src/usr.bin/make/unit-tests/cond1.mk:1.1 src/usr.bin/make/unit-tests/cond1.mk:1.2
--- src/usr.bin/make/unit-tests/cond1.mk:1.1 Thu Aug 21 13:44:51 2014
+++ src/usr.bin/make/unit-tests/cond1.mk Sat Oct 24 08:34:59 2020
@@ -1,4 +1,4 @@
-# $Id: cond1.mk,v 1.1 2014/08/21 13:44:51 apb Exp $
+# $NetBSD: cond1.mk,v 1.2 2020/10/24 08:34:59 rillig Exp $
# hard code these!
TEST_UNAME_S= NetBSD
Index: src/usr.bin/make/unit-tests/doterror.mk
diff -u src/usr.bin/make/unit-tests/doterror.mk:1.1 src/usr.bin/make/unit-tests/doterror.mk:1.2
--- src/usr.bin/make/unit-tests/doterror.mk:1.1 Thu Aug 21 13:44:51 2014
+++ src/usr.bin/make/unit-tests/doterror.mk Sat Oct 24 08:34:59 2020
@@ -1,4 +1,4 @@
-# $Id: doterror.mk,v 1.1 2014/08/21 13:44:51 apb Exp $
+# $NetBSD: doterror.mk,v 1.2 2020/10/24 08:34:59 rillig Exp $
.BEGIN:
Index: src/usr.bin/make/unit-tests/error.mk
diff -u src/usr.bin/make/unit-tests/error.mk:1.1 src/usr.bin/make/unit-tests/error.mk:1.2
--- src/usr.bin/make/unit-tests/error.mk:1.1 Thu Aug 21 13:44:51 2014
+++ src/usr.bin/make/unit-tests/error.mk Sat Oct 24 08:34:59 2020
@@ -1,4 +1,4 @@
-# $Id: error.mk,v 1.1 2014/08/21 13:44:51 apb Exp $
+# $NetBSD: error.mk,v 1.2 2020/10/24 08:34:59 rillig Exp $
.info just FYI
.warning this could be serious
Index: src/usr.bin/make/unit-tests/forsubst.mk
diff -u src/usr.bin/make/unit-tests/forsubst.mk:1.1 src/usr.bin/make/unit-tests/forsubst.mk:1.2
--- src/usr.bin/make/unit-tests/forsubst.mk:1.1 Thu Aug 21 13:44:51 2014
+++ src/usr.bin/make/unit-tests/forsubst.mk Sat Oct 24 08:34:59 2020
@@ -1,4 +1,4 @@
-# $Id: forsubst.mk,v 1.1 2014/08/21 13:44:51 apb Exp $
+# $NetBSD: forsubst.mk,v 1.2 2020/10/24 08:34:59 rillig Exp $
all: for-subst
Index: src/usr.bin/make/unit-tests/modword.mk
diff -u src/usr.bin/make/unit-tests/modword.mk:1.1 src/usr.bin/make/unit-tests/modword.mk:1.2
--- src/usr.bin/make/unit-tests/modword.mk:1.1 Thu Aug 21 13:44:51 2014
+++ src/usr.bin/make/unit-tests/modword.mk Sat Oct 24 08:34:59 2020
@@ -1,4 +1,4 @@
-# $Id: modword.mk,v 1.1 2014/08/21 13:44:51 apb Exp $
+# $NetBSD: modword.mk,v 1.2 2020/10/24 08:34:59 rillig Exp $
#
# Test behaviour of new :[] modifier
Index: src/usr.bin/make/unit-tests/phony-end.mk
diff -u src/usr.bin/make/unit-tests/phony-end.mk:1.1 src/usr.bin/make/unit-tests/phony-end.mk:1.2
--- src/usr.bin/make/unit-tests/phony-end.mk:1.1 Thu Aug 21 13:44:51 2014
+++ src/usr.bin/make/unit-tests/phony-end.mk Sat Oct 24 08:34:59 2020
@@ -1,4 +1,4 @@
-# $Id: phony-end.mk,v 1.1 2014/08/21 13:44:51 apb Exp $
+# $NetBSD: phony-end.mk,v 1.2 2020/10/24 08:34:59 rillig Exp $
all ok also.ok bug phony:
@echo '${.TARGET .PREFIX .IMPSRC:L:@v@$v="${$v}"@}'
Index: src/usr.bin/make/unit-tests/posix.mk
diff -u src/usr.bin/make/unit-tests/posix.mk:1.1 src/usr.bin/make/unit-tests/posix.mk:1.2
--- src/usr.bin/make/unit-tests/posix.mk:1.1 Thu Aug 21 13:44:51 2014
+++ src/usr.bin/make/unit-tests/posix.mk Sat Oct 24 08:34:59 2020
@@ -1,4 +1,4 @@
-# $Id: posix.mk,v 1.1 2014/08/21 13:44:51 apb Exp $
+# $NetBSD: posix.mk,v 1.2 2020/10/24 08:34:59 rillig Exp $
all: x plus subs err
Index: src/usr.bin/make/unit-tests/qequals.mk
diff -u src/usr.bin/make/unit-tests/qequals.mk:1.1 src/usr.bin/make/unit-tests/qequals.mk:1.2
--- src/usr.bin/make/unit-tests/qequals.mk:1.1 Thu Aug 21 13:44:51 2014
+++ src/usr.bin/make/unit-tests/qequals.mk Sat Oct 24 08:34:59 2020
@@ -1,4 +1,4 @@
-# $Id: qequals.mk,v 1.1 2014/08/21 13:44:51 apb Exp $
+# $NetBSD: qequals.mk,v 1.2 2020/10/24 08:34:59 rillig Exp $
M= i386
V.i386= OK
Index: src/usr.bin/make/unit-tests/sunshcmd.mk
diff -u src/usr.bin/make/unit-tests/sunshcmd.mk:1.1 src/usr.bin/make/unit-tests/sunshcmd.mk:1.2
--- src/usr.bin/make/unit-tests/sunshcmd.mk:1.1 Thu Aug 21 13:44:51 2014
+++ src/usr.bin/make/unit-tests/sunshcmd.mk Sat Oct 24 08:34:59 2020
@@ -1,3 +1,5 @@
+# $NetBSD: sunshcmd.mk,v 1.2 2020/10/24 08:34:59 rillig Exp $
+
BYECMD = echo bye
LATERCMD = echo later
TEST1 :sh = echo hello
Index: src/usr.bin/make/unit-tests/ternary.mk
diff -u src/usr.bin/make/unit-tests/ternary.mk:1.1 src/usr.bin/make/unit-tests/ternary.mk:1.2
--- src/usr.bin/make/unit-tests/ternary.mk:1.1 Thu Aug 21 13:44:52 2014
+++ src/usr.bin/make/unit-tests/ternary.mk Sat Oct 24 08:34:59 2020
@@ -1,3 +1,4 @@
+# $NetBSD: ternary.mk,v 1.2 2020/10/24 08:34:59 rillig Exp $
all:
@for x in "" A= A=42; do ${.MAKE} -f ${MAKEFILE} show $$x; done
Index: src/usr.bin/make/unit-tests/escape.mk
diff -u src/usr.bin/make/unit-tests/escape.mk:1.11 src/usr.bin/make/unit-tests/escape.mk:1.12
--- src/usr.bin/make/unit-tests/escape.mk:1.11 Tue Jan 7 20:50:12 2020
+++ src/usr.bin/make/unit-tests/escape.mk Sat Oct 24 08:34:59 2020
@@ -1,4 +1,4 @@
-# $Id: escape.mk,v 1.11 2020/01/07 20:50:12 rillig Exp $
+# $NetBSD: escape.mk,v 1.12 2020/10/24 08:34:59 rillig Exp $
#
# Test backslash escaping.
Index: src/usr.bin/make/unit-tests/export-all.mk
diff -u src/usr.bin/make/unit-tests/export-all.mk:1.3 src/usr.bin/make/unit-tests/export-all.mk:1.4
--- src/usr.bin/make/unit-tests/export-all.mk:1.3 Mon Jul 27 19:45:56 2020
+++ src/usr.bin/make/unit-tests/export-all.mk Sat Oct 24 08:34:59 2020
@@ -1,4 +1,4 @@
-# $Id: export-all.mk,v 1.3 2020/07/27 19:45:56 rillig Exp $
+# $NetBSD: export-all.mk,v 1.4 2020/10/24 08:34:59 rillig Exp $
UT_OK=good
UT_F=fine
Index: src/usr.bin/make/unit-tests/forloop.mk
diff -u src/usr.bin/make/unit-tests/forloop.mk:1.3 src/usr.bin/make/unit-tests/forloop.mk:1.4
--- src/usr.bin/make/unit-tests/forloop.mk:1.3 Wed Sep 2 05:36:58 2020
+++ src/usr.bin/make/unit-tests/forloop.mk Sat Oct 24 08:34:59 2020
@@ -1,4 +1,4 @@
-# $Id: forloop.mk,v 1.3 2020/09/02 05:36:58 rillig Exp $
+# $NetBSD: forloop.mk,v 1.4 2020/10/24 08:34:59 rillig Exp $
all: for-loop
Index: src/usr.bin/make/unit-tests/unexport.mk
diff -u src/usr.bin/make/unit-tests/unexport.mk:1.3 src/usr.bin/make/unit-tests/unexport.mk:1.4
--- src/usr.bin/make/unit-tests/unexport.mk:1.3 Sat Aug 8 13:00:07 2020
+++ src/usr.bin/make/unit-tests/unexport.mk Sat Oct 24 08:34:59 2020
@@ -1,4 +1,4 @@
-# $Id: unexport.mk,v 1.3 2020/08/08 13:00:07 rillig Exp $
+# $NetBSD: unexport.mk,v 1.4 2020/10/24 08:34:59 rillig Exp $
# pick up a bunch of exported vars
FILTER_CMD= grep ^UT_
Index: src/usr.bin/make/unit-tests/varcmd.mk
diff -u src/usr.bin/make/unit-tests/varcmd.mk:1.3 src/usr.bin/make/unit-tests/varcmd.mk:1.4
--- src/usr.bin/make/unit-tests/varcmd.mk:1.3 Fri Dec 8 03:36:42 2017
+++ src/usr.bin/make/unit-tests/varcmd.mk Sat Oct 24 08:34:59 2020
@@ -1,4 +1,4 @@
-# $Id: varcmd.mk,v 1.3 2017/12/08 03:36:42 sjg Exp $
+# $NetBSD: varcmd.mk,v 1.4 2020/10/24 08:34:59 rillig Exp $
#
# Test behaviour of recursive make and vars set on command line.
Index: src/usr.bin/make/unit-tests/export-env.mk
diff -u src/usr.bin/make/unit-tests/export-env.mk:1.2 src/usr.bin/make/unit-tests/export-env.mk:1.3
--- src/usr.bin/make/unit-tests/export-env.mk:1.2 Thu Feb 18 20:25:08 2016
+++ src/usr.bin/make/unit-tests/export-env.mk Sat Oct 24 08:34:59 2020
@@ -1,4 +1,4 @@
-# $Id: export-env.mk,v 1.2 2016/02/18 20:25:08 sjg Exp $
+# $NetBSD: export-env.mk,v 1.3 2020/10/24 08:34:59 rillig Exp $
# our normal .export, subsequent changes affect the environment
UT_TEST=this
Index: src/usr.bin/make/unit-tests/unexport-env.mk
diff -u src/usr.bin/make/unit-tests/unexport-env.mk:1.2 src/usr.bin/make/unit-tests/unexport-env.mk:1.3
--- src/usr.bin/make/unit-tests/unexport-env.mk:1.2 Mon Jul 27 19:45:56 2020
+++ src/usr.bin/make/unit-tests/unexport-env.mk Sat Oct 24 08:34:59 2020
@@ -1,4 +1,4 @@
-# $Id: unexport-env.mk,v 1.2 2020/07/27 19:45:56 rillig Exp $
+# $NetBSD: unexport-env.mk,v 1.3 2020/10/24 08:34:59 rillig Exp $
# pick up a bunch of exported vars
FILTER_CMD= grep ^UT_
Index: src/usr.bin/make/unit-tests/varshell.mk
diff -u src/usr.bin/make/unit-tests/varshell.mk:1.2 src/usr.bin/make/unit-tests/varshell.mk:1.3
--- src/usr.bin/make/unit-tests/varshell.mk:1.2 Fri Apr 10 20:41:59 2015
+++ src/usr.bin/make/unit-tests/varshell.mk Sat Oct 24 08:34:59 2020
@@ -1,4 +1,4 @@
-# $Id: varshell.mk,v 1.2 2015/04/10 20:41:59 sjg Exp $
+# $NetBSD: varshell.mk,v 1.3 2020/10/24 08:34:59 rillig Exp $
#
# Test VAR != shell command
Index: src/usr.bin/make/unit-tests/export.mk
diff -u src/usr.bin/make/unit-tests/export.mk:1.7 src/usr.bin/make/unit-tests/export.mk:1.8
--- src/usr.bin/make/unit-tests/export.mk:1.7 Sat Oct 17 16:53:26 2020
+++ src/usr.bin/make/unit-tests/export.mk Sat Oct 24 08:34:59 2020
@@ -1,4 +1,4 @@
-# $Id: export.mk,v 1.7 2020/10/17 16:53:26 rillig Exp $
+# $NetBSD: export.mk,v 1.8 2020/10/24 08:34:59 rillig Exp $
UT_TEST=export
UT_FOO=foo${BAR}
Index: src/usr.bin/make/unit-tests/moderrs.mk
diff -u src/usr.bin/make/unit-tests/moderrs.mk:1.15 src/usr.bin/make/unit-tests/moderrs.mk:1.16
--- src/usr.bin/make/unit-tests/moderrs.mk:1.15 Tue Aug 25 20:49:40 2020
+++ src/usr.bin/make/unit-tests/moderrs.mk Sat Oct 24 08:34:59 2020
@@ -1,4 +1,4 @@
-# $Id: moderrs.mk,v 1.15 2020/08/25 20:49:40 rillig Exp $
+# $NetBSD: moderrs.mk,v 1.16 2020/10/24 08:34:59 rillig Exp $
#
# various modifier error tests
Index: src/usr.bin/make/unit-tests/modmisc.mk
diff -u src/usr.bin/make/unit-tests/modmisc.mk:1.46 src/usr.bin/make/unit-tests/modmisc.mk:1.47
--- src/usr.bin/make/unit-tests/modmisc.mk:1.46 Sun Aug 23 15:18:43 2020
+++ src/usr.bin/make/unit-tests/modmisc.mk Sat Oct 24 08:34:59 2020
@@ -1,4 +1,4 @@
-# $Id: modmisc.mk,v 1.46 2020/08/23 15:18:43 rillig Exp $
+# $NetBSD: modmisc.mk,v 1.47 2020/10/24 08:34:59 rillig Exp $
#
# miscellaneous modifier tests
Index: src/usr.bin/make/unit-tests/modts.mk
diff -u src/usr.bin/make/unit-tests/modts.mk:1.5 src/usr.bin/make/unit-tests/modts.mk:1.6
--- src/usr.bin/make/unit-tests/modts.mk:1.5 Mon Aug 31 19:58:21 2020
+++ src/usr.bin/make/unit-tests/modts.mk Sat Oct 24 08:34:59 2020
@@ -1,3 +1,4 @@
+# $NetBSD: modts.mk,v 1.6 2020/10/24 08:34:59 rillig Exp $
LIST= one two three
LIST+= four five six
Index: src/usr.bin/make/unit-tests/sysv.mk
diff -u src/usr.bin/make/unit-tests/sysv.mk:1.13 src/usr.bin/make/unit-tests/sysv.mk:1.14
--- src/usr.bin/make/unit-tests/sysv.mk:1.13 Sun Aug 23 14:52:06 2020
+++ src/usr.bin/make/unit-tests/sysv.mk Sat Oct 24 08:34:59 2020
@@ -1,4 +1,4 @@
-# $Id: sysv.mk,v 1.13 2020/08/23 14:52:06 rillig Exp $
+# $NetBSD: sysv.mk,v 1.14 2020/10/24 08:34:59 rillig Exp $
all: foo fun sam bla
Index: src/usr.bin/make/unit-tests/varmisc.mk
diff -u src/usr.bin/make/unit-tests/varmisc.mk:1.23 src/usr.bin/make/unit-tests/varmisc.mk:1.24
--- src/usr.bin/make/unit-tests/varmisc.mk:1.23 Mon Aug 31 16:20:00 2020
+++ src/usr.bin/make/unit-tests/varmisc.mk Sat Oct 24 08:34:59 2020
@@ -1,4 +1,4 @@
-# $Id: varmisc.mk,v 1.23 2020/08/31 16:20:00 sjg Exp $
+# $NetBSD: varmisc.mk,v 1.24 2020/10/24 08:34:59 rillig Exp $
#
# Miscellaneous variable tests.
