From: Jeff King <peff@peff.net>
To: Andreas Schwab <schwab@linux-m68k.org>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [ANNOUNCE] Git v2.9.1
Date: Mon, 11 Jul 2016 19:54:18 -0400 [thread overview]
Message-ID: <20160711235417.GA26163@sigill.intra.peff.net> (raw)
In-Reply-To: <87lh17kgdy.fsf@linux-m68k.org>
On Mon, Jul 11, 2016 at 11:35:05PM +0200, Andreas Schwab wrote:
> Junio C Hamano <gitster@pobox.com> writes:
>
> > local_tzoffset: detect errors from tm_to_time_t
>
> not ok 19 - show date (iso:5758122296 -0400)
> #
> # echo "$time -> $expect" >expect &&
> # test-date show:$format "$time" >actual &&
> # test_cmp expect actual
> #
> not ok 20 - show date (iso-local:5758122296 -0400)
> #
> # echo "$time -> $expect" >expect &&
> # test-date show:$format "$time" >actual &&
> # test_cmp expect actual
>
> This is outside the range of 32bit time_t.
Yes, that's somewhat the point of the test.
How does it fail for you (what does it look like with "-v")? We may be
able to check for an outcome that matches both cases.
Otherwise, we'll have to skip the test, perhaps with something like the
patch below. I suspect the problem is actually the size of "unsigned
long", not time_t, as we use that internally for a bunch of time
computation.
---
diff --git a/help.c b/help.c
index 19328ea..0cea240 100644
--- a/help.c
+++ b/help.c
@@ -419,6 +419,13 @@ 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-unsigned-long: %d",
+ (int)sizeof(unsigned long));
+ /* maybe also save and output GIT-BUILD_OPTIONS? */
+ }
+ }
return 0;
}
diff --git a/t/t0006-date.sh b/t/t0006-date.sh
index 04ce535..a0b8497 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" 64BIT
+check_show iso-local "$FUTURE" "2152-06-19 22:24:56 +0000" 64BIT
check_parse() {
echo "$1 -> $2" >expect
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 0055ebb..d592bdc 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 64BIT '
+ test 8 -le "$(build_option sizeof-unsigned-long)"
+'
next prev parent reply other threads:[~2016-07-11 23:54 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-11 20:13 [ANNOUNCE] Git v2.9.1 Junio C Hamano
2016-07-11 21:35 ` Andreas Schwab
2016-07-11 23:54 ` Jeff King [this message]
2016-07-12 0:40 ` Anders Kaseorg
2016-07-12 14:06 ` Jeff King
2016-07-12 0:56 ` Eric Wong
2016-07-12 1:15 ` Jeff King
2016-07-12 1:59 ` Junio C Hamano
2016-07-12 3:57 ` Jeff King
2016-07-12 15:55 ` Junio C Hamano
2016-07-12 7:30 ` Johannes Schindelin
2016-07-12 7:39 ` Jeff King
2016-07-12 11:25 ` Johannes Schindelin
2016-07-12 14:04 ` Jeff King
2016-07-13 11:35 ` Johannes Schindelin
2016-07-13 16:03 ` Junio C Hamano
2016-07-13 19:10 ` Johannes Schindelin
2016-07-13 19:41 ` Junio C Hamano
2016-07-14 7:50 ` Johannes Schindelin
2016-07-12 18:12 ` Junio C Hamano
2016-07-13 1:53 ` Junio C Hamano
2016-07-13 2:01 ` Jeff King
2016-07-13 16:05 ` Junio C Hamano
2016-07-13 18:52 ` Johannes Schindelin
2016-07-13 19:07 ` Junio C Hamano
2016-07-14 7:45 ` Johannes Schindelin
2016-07-14 8:01 ` Andreas Schwab
2016-07-14 8:15 ` Jeff King
2016-07-14 16:06 ` Johannes Schindelin
2016-07-12 7:40 ` Andreas Schwab
2016-07-12 10:57 ` Johannes Schindelin
2016-07-12 13:00 ` Andreas Schwab
2016-07-12 13:22 ` Johannes Schindelin
2016-07-12 13:31 ` Andreas Schwab
2016-07-12 13:46 ` Jeff King
2016-07-12 18:38 ` Duy Nguyen
2016-07-13 11:29 ` Johannes Schindelin
2016-07-13 11:25 ` Johannes Schindelin
2016-07-12 14:34 ` Junio C Hamano
2016-07-12 15:16 ` Jeff King
2016-07-12 15:25 ` Junio C Hamano
2016-07-12 15:35 ` Jeff King
2016-07-12 15:41 ` Junio C Hamano
2016-07-12 16:09 ` Jeff King
2016-07-12 16:25 ` Junio C Hamano
2016-07-13 14:00 ` Johannes Schindelin
2016-07-13 16:10 ` Junio C Hamano
2016-07-13 18:53 ` Johannes Schindelin
2016-07-12 18:15 ` Andreas Schwab
2016-07-13 20:43 ` Junio C Hamano
2016-07-14 7:38 ` Lars Schneider
2016-07-16 5:50 ` Duy Nguyen
2016-07-14 7:58 ` 32-bit Travis, was " Johannes Schindelin
2016-07-14 9:12 ` Mike Hommey
2016-07-14 10:58 ` Johannes Schindelin
2016-07-15 1:59 ` Mike Hommey
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160711235417.GA26163@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=schwab@linux-m68k.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).