Re: [ANNOUNCE] Git v2.9.1
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Jul 13, 2016, 18:52 UTC
- Message-ID
- <alpine.DEB.2.20.1607132048370.6426@virtualbox>
- In-Reply-To
- <xmqqh9bt34n1.fsf@gitster.mtv.corp.google.com>
Hi Junio,
On Wed, 13 Jul 2016, Junio C Hamano wrote:
Show 19 quoted lines
> Jeff King <peff@peff.net> writes: > > > Definitely keep that paragraph. I am quite familiar with the test > > helper and it was not the outcome I initially expected. > > > >> +test_lazy_prereq 64BIT_TIME ' > >> + case "$(test-date show:iso 9999999999)" in > >> + *" -> 2038-"*) > >> + # on this platform, unsigned long is 32-bit, i.e. not large enough > >> + false > > > > I see you tightened up the match a little. TBH, I think we could > > probably just match the whole output string, but I doubt there's much > > chance of a false positive either way. > > Ah, it wasn't meant to be a tightening; rather the above is for > documentation value, i.e. make it stand out what 2038 we are > matching---its answer being "the year portion of the result of the > conversion".
How about this one instead (which is part of the time_t-may-be-int64 branch on https://github.com/dscho/git which I still have to complete, as some unsigned longs still slipped out of my previous net)? It strikes me as much more robust:
-- snipsnap -- From abe59dbb2235bb1d7aad8e78a66e196acb372ec8 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin <johannes.schindelin@gmx.de> Date: Tue, 12 Jul 2016 13:19:53 +0200 Subject: [PATCH] t0006: dates absurdly far require a 64-bit data type
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".
Let's skip those tests if we know they cannot succeed.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> --- t/helper/test-date.c | 5 ++++- t/t0006-date.sh | 6 +++--- t/test-lib.sh | 2 ++ 3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/t/helper/test-date.c b/t/helper/test-date.c index d9ab360..1e12d93 100644 --- a/t/helper/test-date.c +++ b/t/helper/test-date.c @@ -4,7 +4,8 @@ static const char *usage_msg = "\n" " test-date relative [time_t]...\n" " test-date show:<format> [time_t]...\n" " test-date parse [date]...\n" -" test-date approxidate [date]...\n"; +" test-date approxidate [date]...\n" +" test-date is64bit\n"; static void show_relative_dates(char **argv, struct timeval *now) { @@ -93,6 +94,8 @@ int main(int argc, char **argv) parse_dates(argv+1, &now); else if (!strcmp(*argv, "approxidate")) parse_approxidate(argv+1, &now); + else if (!strcmp(*argv, "is64bit")) + return sizeof(unsigned long) == 8 ? 0 : 1; else usage(usage_msg); return 0; diff --git a/t/t0006-date.sh b/t/t0006-date.sh index 04ce535..52f6b62 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" 64BITTIME +check_show iso-local "$FUTURE" "2152-06-19 22:24:56 +0000" 64BITTIME check_parse() { echo "$1 -> $2" >expect diff --git a/t/test-lib.sh b/t/test-lib.sh index 0055ebb..4e1afb0 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -1111,3 +1111,5 @@ run_with_limited_cmdline () { } test_lazy_prereq CMDLINE_LIMIT 'run_with_limited_cmdline true' + +test_lazy_prereq 64BITTIME 'test-date is64bit'
-- 2.9.0.278.g1caae67