Module Name: src
Committed By: rillig
Date: Tue May 9 16:31:41 UTC 2023
Modified Files:
src/usr.bin/make/unit-tests: varmod-gmtime.exp varmod-gmtime.mk
varmod-localtime.exp varmod-localtime.mk
Log Message:
tests/make: clean up tests for ':gmtime' and ':localtime'
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/make/unit-tests/varmod-gmtime.exp
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/make/unit-tests/varmod-gmtime.mk
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/make/unit-tests/varmod-localtime.exp
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/make/unit-tests/varmod-localtime.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/varmod-gmtime.exp
diff -u src/usr.bin/make/unit-tests/varmod-gmtime.exp:1.14 src/usr.bin/make/unit-tests/varmod-gmtime.exp:1.15
--- src/usr.bin/make/unit-tests/varmod-gmtime.exp:1.14 Tue May 9 16:27:00 2023
+++ src/usr.bin/make/unit-tests/varmod-gmtime.exp Tue May 9 16:31:41 2023
@@ -1,13 +1,13 @@
-make: "varmod-gmtime.mk" line 70: Invalid time value "-1"
-make: "varmod-gmtime.mk" line 70: Malformed conditional (${:L:gmtime=-1} != "")
-make: "varmod-gmtime.mk" line 79: Invalid time value " 1"
-make: "varmod-gmtime.mk" line 79: Malformed conditional (${:L:gmtime= 1} != "")
-make: "varmod-gmtime.mk" line 125: Invalid time value "10000000000000000000000000000000"
-make: "varmod-gmtime.mk" line 125: Malformed conditional (${:L:gmtime=10000000000000000000000000000000} != "")
-make: "varmod-gmtime.mk" line 136: Invalid time value "error"
-make: "varmod-gmtime.mk" line 136: Malformed conditional (${:L:gmtime=error} != "")
-make: "varmod-gmtime.mk" line 145: Invalid time value "100000S,1970,bad,"
-make: "varmod-gmtime.mk" line 145: Malformed conditional (${%Y:L:gmtime=100000S,1970,bad,} != "bad")
+make: "varmod-gmtime.mk" line 59: Invalid time value "-1"
+make: "varmod-gmtime.mk" line 59: Malformed conditional (${:L:gmtime=-1} != "")
+make: "varmod-gmtime.mk" line 68: Invalid time value " 1"
+make: "varmod-gmtime.mk" line 68: Malformed conditional (${:L:gmtime= 1} != "")
+make: "varmod-gmtime.mk" line 114: Invalid time value "10000000000000000000000000000000"
+make: "varmod-gmtime.mk" line 114: Malformed conditional (${:L:gmtime=10000000000000000000000000000000} != "")
+make: "varmod-gmtime.mk" line 125: Invalid time value "error"
+make: "varmod-gmtime.mk" line 125: Malformed conditional (${:L:gmtime=error} != "")
+make: "varmod-gmtime.mk" line 134: Invalid time value "100000S,1970,bad,"
+make: "varmod-gmtime.mk" line 134: Malformed conditional (${%Y:L:gmtime=100000S,1970,bad,} != "bad")
make: Fatal errors encountered -- cannot continue
make: stopped in unit-tests
exit status 1
Index: src/usr.bin/make/unit-tests/varmod-gmtime.mk
diff -u src/usr.bin/make/unit-tests/varmod-gmtime.mk:1.12 src/usr.bin/make/unit-tests/varmod-gmtime.mk:1.13
--- src/usr.bin/make/unit-tests/varmod-gmtime.mk:1.12 Tue May 9 16:27:00 2023
+++ src/usr.bin/make/unit-tests/varmod-gmtime.mk Tue May 9 16:31:41 2023
@@ -1,4 +1,4 @@
-# $NetBSD: varmod-gmtime.mk,v 1.12 2023/05/09 16:27:00 rillig Exp $
+# $NetBSD: varmod-gmtime.mk,v 1.13 2023/05/09 16:31:41 rillig Exp $
#
# Tests for the :gmtime variable modifier, which formats a timestamp
# using strftime(3) in UTC.
@@ -46,17 +46,6 @@
# Before var.c 1.1050 from 2023-05-09, it was not possible to pass the
# seconds via a variable expression.
-# delete me
-# delete me
-# delete me
-# delete me
-# delete me
-# delete me
-# delete me
-# delete me
-# delete me
-# delete me
-# delete me
.if ${%Y:L:gmtime=${:U1593536400}} != "2020"
. error
.endif
Index: src/usr.bin/make/unit-tests/varmod-localtime.exp
diff -u src/usr.bin/make/unit-tests/varmod-localtime.exp:1.11 src/usr.bin/make/unit-tests/varmod-localtime.exp:1.12
--- src/usr.bin/make/unit-tests/varmod-localtime.exp:1.11 Tue May 9 16:27:00 2023
+++ src/usr.bin/make/unit-tests/varmod-localtime.exp Tue May 9 16:31:41 2023
@@ -1,13 +1,13 @@
-make: "varmod-localtime.mk" line 70: Invalid time value "-1"
-make: "varmod-localtime.mk" line 70: Malformed conditional (${:L:localtime=-1} != "")
-make: "varmod-localtime.mk" line 79: Invalid time value " 1"
-make: "varmod-localtime.mk" line 79: Malformed conditional (${:L:localtime= 1} != "")
-make: "varmod-localtime.mk" line 125: Invalid time value "10000000000000000000000000000000"
-make: "varmod-localtime.mk" line 125: Malformed conditional (${:L:localtime=10000000000000000000000000000000} != "")
-make: "varmod-localtime.mk" line 136: Invalid time value "error"
-make: "varmod-localtime.mk" line 136: Malformed conditional (${:L:localtime=error} != "")
-make: "varmod-localtime.mk" line 145: Invalid time value "100000S,1970,bad,"
-make: "varmod-localtime.mk" line 145: Malformed conditional (${%Y:L:localtime=100000S,1970,bad,} != "bad")
+make: "varmod-localtime.mk" line 59: Invalid time value "-1"
+make: "varmod-localtime.mk" line 59: Malformed conditional (${:L:localtime=-1} != "")
+make: "varmod-localtime.mk" line 68: Invalid time value " 1"
+make: "varmod-localtime.mk" line 68: Malformed conditional (${:L:localtime= 1} != "")
+make: "varmod-localtime.mk" line 114: Invalid time value "10000000000000000000000000000000"
+make: "varmod-localtime.mk" line 114: Malformed conditional (${:L:localtime=10000000000000000000000000000000} != "")
+make: "varmod-localtime.mk" line 125: Invalid time value "error"
+make: "varmod-localtime.mk" line 125: Malformed conditional (${:L:localtime=error} != "")
+make: "varmod-localtime.mk" line 134: Invalid time value "100000S,1970,bad,"
+make: "varmod-localtime.mk" line 134: Malformed conditional (${%Y:L:localtime=100000S,1970,bad,} != "bad")
make: Fatal errors encountered -- cannot continue
make: stopped in unit-tests
exit status 1
Index: src/usr.bin/make/unit-tests/varmod-localtime.mk
diff -u src/usr.bin/make/unit-tests/varmod-localtime.mk:1.10 src/usr.bin/make/unit-tests/varmod-localtime.mk:1.11
--- src/usr.bin/make/unit-tests/varmod-localtime.mk:1.10 Tue May 9 16:27:00 2023
+++ src/usr.bin/make/unit-tests/varmod-localtime.mk Tue May 9 16:31:41 2023
@@ -1,4 +1,4 @@
-# $NetBSD: varmod-localtime.mk,v 1.10 2023/05/09 16:27:00 rillig Exp $
+# $NetBSD: varmod-localtime.mk,v 1.11 2023/05/09 16:31:41 rillig Exp $
#
# Tests for the :localtime variable modifier, which formats a timestamp
# using strftime(3) in local time.
@@ -46,17 +46,6 @@
# Before var.c 1.1050 from 2023-05-09, it was not possible to pass the
# seconds via a variable expression.
-# delete me
-# delete me
-# delete me
-# delete me
-# delete me
-# delete me
-# delete me
-# delete me
-# delete me
-# delete me
-# delete me
.if ${%Y:L:localtime=${:U1593536400}} != "2020"
. error
.endif
