Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/make/unit-tests tests/make: clean up tests for ':gmt...



details:   https://anonhg.NetBSD.org/src/rev/870e2c940350
branches:  trunk
changeset: 374662:870e2c940350
user:      rillig <rillig%NetBSD.org@localhost>
date:      Tue May 09 16:31:41 2023 +0000

description:
tests/make: clean up tests for ':gmtime' and ':localtime'

diffstat:

 usr.bin/make/unit-tests/varmod-gmtime.exp    |  20 ++++++++++----------
 usr.bin/make/unit-tests/varmod-gmtime.mk     |  13 +------------
 usr.bin/make/unit-tests/varmod-localtime.exp |  20 ++++++++++----------
 usr.bin/make/unit-tests/varmod-localtime.mk  |  13 +------------
 4 files changed, 22 insertions(+), 44 deletions(-)

diffs (108 lines):

diff -r 98f716a749ca -r 870e2c940350 usr.bin/make/unit-tests/varmod-gmtime.exp
--- a/usr.bin/make/unit-tests/varmod-gmtime.exp Tue May 09 16:26:59 2023 +0000
+++ b/usr.bin/make/unit-tests/varmod-gmtime.exp Tue May 09 16:31:41 2023 +0000
@@ -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
diff -r 98f716a749ca -r 870e2c940350 usr.bin/make/unit-tests/varmod-gmtime.mk
--- a/usr.bin/make/unit-tests/varmod-gmtime.mk  Tue May 09 16:26:59 2023 +0000
+++ b/usr.bin/make/unit-tests/varmod-gmtime.mk  Tue May 09 16:31:41 2023 +0000
@@ -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
diff -r 98f716a749ca -r 870e2c940350 usr.bin/make/unit-tests/varmod-localtime.exp
--- a/usr.bin/make/unit-tests/varmod-localtime.exp      Tue May 09 16:26:59 2023 +0000
+++ b/usr.bin/make/unit-tests/varmod-localtime.exp      Tue May 09 16:31:41 2023 +0000
@@ -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
diff -r 98f716a749ca -r 870e2c940350 usr.bin/make/unit-tests/varmod-localtime.mk
--- a/usr.bin/make/unit-tests/varmod-localtime.mk       Tue May 09 16:26:59 2023 +0000
+++ b/usr.bin/make/unit-tests/varmod-localtime.mk       Tue May 09 16:31:41 2023 +0000
@@ -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



Home | Main Index | Thread Index | Old Index