Module Name: src
Committed By: rillig
Date: Mon Nov 30 21:10:15 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: Makefile varmod-gmtime.exp
varmod-localtime.exp
Log Message:
make(1): fix tests for :gmtime and :localtime for 32-bit time_t
https://bugs.freebsd.org/251465
To generate a diff of this commit:
cvs rdiff -u -r1.230 -r1.231 src/usr.bin/make/unit-tests/Makefile
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/varmod-gmtime.exp
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/varmod-localtime.exp
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/Makefile
diff -u src/usr.bin/make/unit-tests/Makefile:1.230 src/usr.bin/make/unit-tests/Makefile:1.231
--- src/usr.bin/make/unit-tests/Makefile:1.230 Mon Nov 30 18:32:49 2020
+++ src/usr.bin/make/unit-tests/Makefile Mon Nov 30 21:10:15 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.230 2020/11/30 18:32:49 sjg Exp $
+# $NetBSD: Makefile,v 1.231 2020/11/30 21:10:15 rillig Exp $
#
# Unit tests for make(1)
#
@@ -473,9 +473,15 @@ SED_CMDS.var-op-shell+= \
-e 's,^${.SHELL:T}: [ 0-9:]*,,' \
-e '/command/s,No such.*,not found,'
SED_CMDS.vardebug+= -e 's,${.SHELL},</path/to/shell>,'
+SED_CMDS.varmod-edge+= -e 's, line [0-9]*:, line omitted:,'
+SED_CMDS.varmod-gmtime+= -e 's,Tue Jan 19 03:14:08 2038,<normalized>,'
+SED_CMDS.varmod-gmtime+= ${:D FreeBSD i386 still has 32-bit time_t. }
+SED_CMDS.varmod-gmtime+= -e 's,Fri Dec 13 20:45:52 1901,<normalized>,'
+SED_CMDS.varmod-localtime+= -e 's,Tue Jan 19 04:14:08 2038,<normalized>,'
+SED_CMDS.varmod-localtime+= ${:D FreeBSD i386 still has 32-bit time_t. }
+SED_CMDS.varmod-localtime+= -e 's,Fri Dec 13 21:45:52 1901,<normalized>,'
SED_CMDS.varmod-subst-regex+= \
-e 's,\(Regex compilation error:\).*,\1 (details omitted),'
-SED_CMDS.varmod-edge+= -e 's, line [0-9]*:, line omitted:,'
SED_CMDS.varname-dot-parsedir= -e '/in some cases/ s,^make: "[^"]*,make: "<normalized>,'
SED_CMDS.varname-dot-parsefile= -e '/in some cases/ s,^make: "[^"]*,make: "<normalized>,'
SED_CMDS.varname-dot-shell= -e 's, = /[^ ]*, = (details omitted),g'
Index: src/usr.bin/make/unit-tests/varmod-gmtime.exp
diff -u src/usr.bin/make/unit-tests/varmod-gmtime.exp:1.6 src/usr.bin/make/unit-tests/varmod-gmtime.exp:1.7
--- src/usr.bin/make/unit-tests/varmod-gmtime.exp:1.6 Sat Oct 31 21:40:20 2020
+++ src/usr.bin/make/unit-tests/varmod-gmtime.exp Mon Nov 30 21:10:15 2020
@@ -17,7 +17,7 @@ make: Invalid time value: 1}.
: 0 becomes ok.
: 1 becomes Thu Jan 1 00:00:01 1970.
: INT32_MAX becomes Tue Jan 19 03:14:07 2038.
-: INT32_MAX + 1 becomes Tue Jan 19 03:14:08 2038.
+: INT32_MAX + 1 becomes <normalized>.
make: Invalid time value: 10000000000000000000000000000000}.
: overflow becomes mtime=10000000000000000000000000000000}.
Index: src/usr.bin/make/unit-tests/varmod-localtime.exp
diff -u src/usr.bin/make/unit-tests/varmod-localtime.exp:1.4 src/usr.bin/make/unit-tests/varmod-localtime.exp:1.5
--- src/usr.bin/make/unit-tests/varmod-localtime.exp:1.4 Sat Oct 31 21:40:20 2020
+++ src/usr.bin/make/unit-tests/varmod-localtime.exp Mon Nov 30 21:10:15 2020
@@ -17,7 +17,7 @@ make: Invalid time value: 1}.
: 0 becomes ok.
: 1 becomes Thu Jan 1 01:00:01 1970.
: INT32_MAX becomes Tue Jan 19 04:14:07 2038.
-: INT32_MAX + 1 becomes Tue Jan 19 04:14:08 2038.
+: INT32_MAX + 1 becomes <normalized>.
make: Invalid time value: 10000000000000000000000000000000}.
: overflow becomes ocaltime=10000000000000000000000000000000}.
