[src/trunk]: src/usr.bin/make/unit-tests make(1): fix tests for :gmtime and :...

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6cf9bf0b6360
branches:  trunk
changeset: 957506:6cf9bf0b6360
user:      rillig <rillig%NetBSD.org@localhost>
date:      Mon Nov 30 21:10:15 2020 +0000

description:
make(1): fix tests for :gmtime and :localtime for 32-bit time_t

https://bugs.freebsd.org/251465

diffstat:

 usr.bin/make/unit-tests/Makefile             |  10 ++++++++--
 usr.bin/make/unit-tests/varmod-gmtime.exp    |   2 +-
 usr.bin/make/unit-tests/varmod-localtime.exp |   2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diffs (50 lines):

diff -r a2d79bc73f23 -r 6cf9bf0b6360 usr.bin/make/unit-tests/Makefile
--- a/usr.bin/make/unit-tests/Makefile  Mon Nov 30 21:06:56 2020 +0000
+++ b/usr.bin/make/unit-tests/Makefile  Mon Nov 30 21:10:15 2020 +0000
@@ -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 @@
        -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'
diff -r a2d79bc73f23 -r 6cf9bf0b6360 usr.bin/make/unit-tests/varmod-gmtime.exp
--- a/usr.bin/make/unit-tests/varmod-gmtime.exp Mon Nov 30 21:06:56 2020 +0000
+++ b/usr.bin/make/unit-tests/varmod-gmtime.exp Mon Nov 30 21:10:15 2020 +0000
@@ -17,7 +17,7 @@
 : 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}.
diff -r a2d79bc73f23 -r 6cf9bf0b6360 usr.bin/make/unit-tests/varmod-localtime.exp
--- a/usr.bin/make/unit-tests/varmod-localtime.exp      Mon Nov 30 21:06:56 2020 +0000
+++ b/usr.bin/make/unit-tests/varmod-localtime.exp      Mon Nov 30 21:10:15 2020 +0000
@@ -17,7 +17,7 @@
 : 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}.