From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: "Jeff King" <peff@peff.net>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"René Scharfe" <l.s.r@web.de>, "Johannes Sixt" <j6t@kdbg.org>
Subject: [PATCH v2 1/2] t0006: skip "far in the future" test when unsigned long is not long enough
Date: Thu, 14 Jul 2016 13:43:56 -0700 [thread overview]
Message-ID: <20160714204357.2628-2-gitster@pobox.com> (raw)
In-Reply-To: <20160714204357.2628-1-gitster@pobox.com>
From: Jeff King <peff@peff.net>
Git's source code refers to timestamps as unsigned longs. On 32-bit
platforms, as well as on Windows, unsigned long is not large enough
to capture dates that are "absurdly far in the future".
While we can fix this issue properly by replacing unsigned long with
a larger type, we want to be a bit more conservative and just skip
those tests on the maint track.
Signed-off-by: Jeff King <peff@peff.net>
Helped-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
help.c | 6 ++++++
t/t0006-date.sh | 6 +++---
t/test-lib.sh | 9 +++++++++
3 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/help.c b/help.c
index 19328ea..2ff3b5a 100644
--- a/help.c
+++ b/help.c
@@ -419,6 +419,12 @@ int cmd_version(int argc, const char **argv, const char *prefix)
* with external projects that rely on the output of "git version".
*/
printf("git version %s\n", git_version_string);
+ while (*++argv) {
+ if (!strcmp(*argv, "--build-options")) {
+ printf("sizeof-long: %d\n", (int)sizeof(long));
+ /* NEEDSWORK: also save and output GIT-BUILD_OPTIONS? */
+ }
+ }
return 0;
}
diff --git a/t/t0006-date.sh b/t/t0006-date.sh
index 04ce535..4c8cf58 100755
--- a/t/t0006-date.sh
+++ b/t/t0006-date.sh
@@ -31,7 +31,7 @@ check_show () {
format=$1
time=$2
expect=$3
- test_expect_${4:-success} "show date ($format:$time)" '
+ test_expect_success $4 "show date ($format:$time)" '
echo "$time -> $expect" >expect &&
test-date show:$format "$time" >actual &&
test_cmp expect actual
@@ -50,8 +50,8 @@ check_show iso-local "$TIME" '2016-06-15 14:13:20 +0000'
# arbitrary time absurdly far in the future
FUTURE="5758122296 -0400"
-check_show iso "$FUTURE" "2152-06-19 18:24:56 -0400"
-check_show iso-local "$FUTURE" "2152-06-19 22:24:56 +0000"
+check_show iso "$FUTURE" "2152-06-19 18:24:56 -0400" LONG_IS_64BIT
+check_show iso-local "$FUTURE" "2152-06-19 22:24:56 +0000" LONG_IS_64BIT
check_parse() {
echo "$1 -> $2" >expect
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 0055ebb..11201e9 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -1111,3 +1111,12 @@ run_with_limited_cmdline () {
}
test_lazy_prereq CMDLINE_LIMIT 'run_with_limited_cmdline true'
+
+build_option () {
+ git version --build-options |
+ sed -ne "s/^$1: //p"
+}
+
+test_lazy_prereq LONG_IS_64BIT '
+ test 8 -le "$(build_option sizeof-long)"
+'
--
2.9.1-545-g8c0a069
next prev parent reply other threads:[~2016-07-14 20:50 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-30 9:06 [PATCH v4 0/5] friendlier handling of overflows in archive-tar Jeff King
2016-06-30 9:07 ` [PATCH v4 1/5] t9300: factor out portable "head -c" replacement Jeff King
2016-07-01 4:45 ` Eric Sunshine
2016-07-01 17:23 ` Junio C Hamano
2016-07-01 18:01 ` Jeff King
2016-06-30 9:08 ` [PATCH v4 2/5] t5000: test tar files that overflow ustar headers Jeff King
2016-07-14 15:47 ` Johannes Schindelin
2016-07-14 16:45 ` Johannes Sixt
2016-07-14 17:08 ` Junio C Hamano
2016-07-14 20:52 ` Johannes Sixt
2016-07-14 21:32 ` Jeff King
2016-07-14 22:30 ` Junio C Hamano
2016-07-14 22:38 ` Jeff King
2016-07-15 13:37 ` Torsten Bögershausen
2016-07-15 13:46 ` Jeff King
2016-07-14 22:26 ` Junio C Hamano
2016-07-14 18:24 ` Jeff King
2016-07-14 18:21 ` Jeff King
2016-07-14 20:00 ` Junio C Hamano
2016-07-14 20:03 ` Junio C Hamano
2016-07-14 20:14 ` Jeff King
2016-07-14 20:09 ` Junio C Hamano
2016-07-14 20:10 ` Jeff King
2016-07-14 20:22 ` Junio C Hamano
2016-07-14 20:27 ` Jeff King
2016-07-14 20:34 ` Junio C Hamano
2016-07-14 20:43 ` [PATCH v2 0/2] ulong may only be 32-bit wide Junio C Hamano
2016-07-14 20:43 ` Junio C Hamano [this message]
2016-07-14 20:43 ` [PATCH v2 2/2] archive-tar: huge offset and future timestamps would not work on 32-bit Junio C Hamano
2016-07-14 22:20 ` Jeff King
2016-07-14 22:36 ` Junio C Hamano
2016-07-16 6:28 ` Duy Nguyen
2016-07-15 15:10 ` [PATCH v4 2/5] t5000: test tar files that overflow ustar headers Johannes Schindelin
2016-07-15 16:49 ` Junio C Hamano
2016-06-30 9:09 ` [PATCH v4 3/5] archive-tar: write extended headers for file sizes >= 8GB Jeff King
2016-07-14 16:48 ` Johannes Sixt
2016-07-14 17:11 ` Junio C Hamano
2016-07-14 18:16 ` Jeff King
2016-07-15 2:59 ` Torsten Bögershausen
2016-06-30 9:09 ` [PATCH v4 4/5] archive-tar: write extended headers for far-future mtime Jeff King
2016-06-30 9:09 ` [PATCH v4 5/5] archive-tar: drop return value Jeff King
2016-06-30 9:14 ` [PATCH v4 6/5] t5000: use test_match_signal 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=20160714204357.2628-2-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
--cc=l.s.r@web.de \
--cc=peff@peff.net \
/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).