undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t0006 & t5000: prepare for 64-bit timestamps

Browse Source 
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".

It is perfectly valid by the C standard, of course, for the `long` data
type to refer to 32-bit integers. That is why the `time_t` data type
exists: so that it can be 64-bit even if `long` is 32-bit. Git's source
code simply uses an incorrect data type for timestamps, is all.

The earlier quick fix 6b9c38e14c (t0006: skip "far in the future" test
when unsigned long is not long enough, 2016-07-11) papered over this
issue simply by skipping the respective test cases on platforms where
they would fail due to the data type in use.

This quick fix, however, tests for *long* to be 64-bit or not. What we
need, though, is a test that says whether *whatever data type we use for
timestamps* is 64-bit or not.

The same quick fix was used to handle the similar problem where Git's
source code uses `unsigned long` to represent size, instead of `size_t`,
conflating the two issues.

So let's just add another prerequisite to test specifically whether
timestamps are represented by a 64-bit data type or not. Later, after we
switch to a larger data type, we can flip that prerequisite to test
`time_t` instead of `long`.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin 2017-04-20 22:52:13 +02:00 committed by Junio C Hamano
parent e467dc148d
commit a07fb0507f
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
t/helper/test-date.c
View File

@ -4,7 +4,8 @@ static const char *usage_msg = "\n"
" test-date relative [time_t]...\n" " test-date relative [time_t]...\n"
" test-date show:<format> [time_t]...\n" " test-date show:<format> [time_t]...\n"
" test-date parse [date]...\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(const char **argv, struct timeval *now) static void show_relative_dates(const char **argv, struct timeval *now)
{ {
@ -93,6 +94,8 @@ int cmd_main(int argc, const char **argv)
parse_dates(argv+1, &now); parse_dates(argv+1, &now);
else if (!strcmp(*argv, "approxidate")) else if (!strcmp(*argv, "approxidate"))
parse_approxidate(argv+1, &now); parse_approxidate(argv+1, &now);
else if (!strcmp(*argv, "is64bit"))
return sizeof(unsigned long) == 8 ? 0 : 1;
else else
usage(usage_msg); usage(usage_msg);
return 0; return 0;

4
t/t0006-date.sh
View File

@ -53,8 +53,8 @@ check_show unix-local "$TIME" '1466000000'
# arbitrary time absurdly far in the future # arbitrary time absurdly far in the future
FUTURE="5758122296 -0400" FUTURE="5758122296 -0400"
check_show iso "$FUTURE" "2152-06-19 18:24:56 -0400" LONG_IS_64BIT check_show iso "$FUTURE" "2152-06-19 18:24:56 -0400" TIME_IS_64BIT
check_show iso-local "$FUTURE" "2152-06-19 22:24:56 +0000" LONG_IS_64BIT check_show iso-local "$FUTURE" "2152-06-19 22:24:56 +0000" TIME_IS_64BIT
check_parse() { check_parse() {
echo "$1 -> $2" >expect echo "$1 -> $2" >expect

6
t/t5000-tar-tree.sh
View File

@ -390,7 +390,7 @@ test_expect_success TAR_HUGE,LONG_IS_64BIT 'system tar can read our huge size' '
test_cmp expect actual test_cmp expect actual
' '
test_expect_success LONG_IS_64BIT 'set up repository with far-future commit' ' test_expect_success TIME_IS_64BIT 'set up repository with far-future commit' '
rm -f .git/index && rm -f .git/index &&
echo content >file && echo content >file &&
git add file && git add file &&
@ -398,11 +398,11 @@ test_expect_success LONG_IS_64BIT 'set up repository with far-future commit' '
git commit -m "tempori parendum" git commit -m "tempori parendum"
' '
test_expect_success LONG_IS_64BIT 'generate tar with future mtime' ' test_expect_success TIME_IS_64BIT 'generate tar with future mtime' '
git archive HEAD >future.tar git archive HEAD >future.tar
' '
test_expect_success TAR_HUGE,LONG_IS_64BIT 'system tar can read our future mtime' ' test_expect_success TAR_HUGE,TIME_IS_64BIT 'system tar can read our future mtime' '
echo 4147 >expect && echo 4147 >expect &&
tar_info future.tar | cut -d" " -f2 >actual && tar_info future.tar | cut -d" " -f2 >actual &&
test_cmp expect actual test_cmp expect actual

2
t/test-lib.sh
View File

@ -1164,3 +1164,5 @@ build_option () {
test_lazy_prereq LONG_IS_64BIT ' test_lazy_prereq LONG_IS_64BIT '
test 8 -le "$(build_option sizeof-long)" test 8 -le "$(build_option sizeof-long)"
' '
test_lazy_prereq TIME_IS_64BIT 'test-date is64bit'