From: Jeff King <peff@peff.net>
To: Charles Bailey <cbailey32@bloomberg.net>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: [PATCH] t4212: handle systems with post-apocalyptic gmtime
Date: Wed, 26 Mar 2014 14:51:53 -0400 [thread overview]
Message-ID: <20140326185153.GA12912@sigill.intra.peff.net> (raw)
In-Reply-To: <20140326182103.GB7087@sigill.intra.peff.net>
One of the tests in t4212 checks our behavior when we feed
gmtime a date so far in the future that it gives up and
returns NULL.
But some gmtime implementations just refuse to quit. They
soldier on, giving us a glimpse of a chilly October evening
some 160 million years in the future (and presumably filled
with our leather-clad horseback-riding ape descendants).
Let's allow the test to match either the sentinel value
(i.e., what we want when gmtime gives up) or any reasonable
value returned by known implementations.
Reported-by: Charles Bailey <cbailey32@bloomberg.net>
Signed-off-by: Jeff King <peff@peff.net>
---
On top of jk/commit-dates-parsing-fix (though the test is already in
v1.9.1).
t/t4212-log-corrupt.sh | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git a/t/t4212-log-corrupt.sh b/t/t4212-log-corrupt.sh
index 85c6df4..08f982c 100755
--- a/t/t4212-log-corrupt.sh
+++ b/t/t4212-log-corrupt.sh
@@ -76,12 +76,27 @@ test_expect_success 'date parser recognizes time_t overflow' '
test_cmp expect actual
'
-# date is within 2^63-1, but enough to choke glibc's gmtime
-test_expect_success 'absurdly far-in-future dates produce sentinel' '
+cmp_one_of () {
+ for candidate in "$@"; do
+ echo "$candidate" >expect &&
+ test_cmp expect actual &&
+ return 0
+ done
+ return 1
+}
+
+# date is within 2^63-1, but enough to choke glibc's gmtime.
+# We check that either the date broke gmtime (and we return the
+# usual epoch value), or gmtime gave us some sensible value.
+#
+# The sensible values are determined experimentally. The first
+# is from AIX.
+test_expect_success 'absurdly far-in-future dates' '
commit=$(munge_author_date HEAD 999999999999999999) &&
- echo "Thu Jan 1 00:00:00 1970 +0000" >expect &&
git log -1 --format=%ad $commit >actual &&
- test_cmp expect actual
+ cmp_one_of \
+ "Thu Jan 1 00:00:00 1970 +0000" \
+ "Thu Oct 24 18:46:39 162396404 -0700"
'
test_done
--
1.9.1.656.ge8a0637
next prev parent reply other threads:[~2014-03-26 18:52 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-24 7:33 [PATCH 0/5] handle bogus commit dates Jeff King
2014-02-24 7:36 ` [PATCH 1/5] t4212: test bogus timestamps with git-log Jeff King
2014-02-24 7:39 ` [PATCH 2/5] fsck: report integer overflow in author timestamps Jeff King
2014-02-24 7:39 ` [PATCH 3/5] date: check date overflow against time_t Jeff King
2014-02-24 7:46 ` [PATCH 4/5] log: handle integer overflow in timestamps Jeff King
2014-02-24 19:50 ` Junio C Hamano
2014-02-24 19:58 ` Jeff King
2014-02-24 20:21 ` Junio C Hamano
2014-02-24 20:37 ` Jeff King
2014-02-24 21:01 ` Junio C Hamano
2014-02-24 7:49 ` [PATCH 5/5] log: do not segfault on gmtime errors Jeff King
2014-03-22 9:32 ` René Scharfe
2014-03-24 21:33 ` Jeff King
2014-03-24 22:03 ` René Scharfe
2014-03-24 22:11 ` Jeff King
2014-03-26 11:05 ` Charles Bailey
2014-03-26 18:21 ` Jeff King
2014-03-26 18:51 ` Jeff King [this message]
2014-03-26 19:18 ` [PATCH] t4212: handle systems with post-apocalyptic gmtime Junio C Hamano
2014-03-26 19:25 ` Jeff King
2014-03-26 19:33 ` Jeff King
2014-03-26 19:40 ` Jeff King
2014-03-26 20:36 ` Charles Bailey
2014-03-26 20:38 ` Jeff King
2014-03-26 20:41 ` Charles Bailey
2014-03-26 21:22 ` Charles Bailey
2014-03-26 21:57 ` Jeff King
2014-03-26 22:46 ` Charles Bailey
2014-03-27 22:48 ` Jeff King
2014-03-28 16:41 ` Junio C Hamano
2014-03-28 18:47 ` Jeff King
2014-03-28 19:02 ` Junio C Hamano
2014-03-28 19:05 ` Jeff King
2014-03-28 19:30 ` Junio C Hamano
2014-04-01 7:38 ` Jeff King
2014-04-01 7:42 ` [PATCH 1/2] date: recognize bogus FreeBSD gmtime output Jeff King
2014-04-01 17:42 ` René Scharfe
2014-04-01 19:08 ` Junio C Hamano
2014-04-01 21:17 ` René Scharfe
2014-04-01 21:28 ` Jeff King
2014-04-01 7:43 ` [PATCH 2/2] t4212: loosen far-in-future test for AIX Jeff King
2014-04-01 7:45 ` [PATCH 2alt/2] work around unreliable gmtime errors on AIX Jeff King
2014-04-01 19:07 ` [PATCH] t4212: handle systems with post-apocalyptic gmtime Junio C Hamano
2014-04-01 19:46 ` Jeff King
2014-03-26 18:58 ` [PATCH 5/5] log: do not segfault on gmtime errors Junio C Hamano
2014-03-26 19:01 ` Jeff King
2014-03-26 21:01 ` Junio C Hamano
2014-03-26 21:09 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140326185153.GA12912@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=cbailey32@bloomberg.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).