diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-07-15 10:49:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-15 10:49:23 -0700 |
| commit | 82246e075e5c028dd886adda68e28de092e33df1 (patch) | |
| tree | f5dd3003cab676c2378c0b0f871fb07638fce7ef /t | |
| parent | Merge branch 'jk/upload-pack-hook' (diff) | |
| parent | Git 2.9.2 (diff) | |
| download | tgif-82246e075e5c028dd886adda68e28de092e33df1.tar.xz | |
Sync with 2.9.2
* maint:
Git 2.9.2
t0006: skip "far in the future" test when unsigned long is not long enough
Diffstat (limited to 't')
| -rwxr-xr-x | t/t0006-date.sh | 6 | ||||
| -rw-r--r-- | t/test-lib.sh | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/t/t0006-date.sh b/t/t0006-date.sh index 04ce53509c..4c8cf58512 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 0055ebba46..11201e9cf8 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)" +' |