From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.1 required=3.0 tests=AWL,BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 99A7B1FE90 for ; Fri, 21 Apr 2017 10:45:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1037709AbdDUKps (ORCPT ); Fri, 21 Apr 2017 06:45:48 -0400 Received: from mout.gmx.net ([212.227.17.22]:51434 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S971323AbdDUKpq (ORCPT ); Fri, 21 Apr 2017 06:45:46 -0400 Received: from virtualbox ([37.201.193.73]) by mail.gmx.com (mrgmx103 [212.227.17.168]) with ESMTPSA (Nemesis) id 0LvUwp-1c1x8X26eh-010ai5; Fri, 21 Apr 2017 12:45:42 +0200 Date: Fri, 21 Apr 2017 12:45:41 +0200 (CEST) From: Johannes Schindelin X-X-Sender: virtualbox@virtualbox To: git@vger.kernel.org cc: Junio C Hamano , =?UTF-8?Q?Torsten_B=C3=B6gershausen?= Subject: [PATCH v4 3/9] t0006 & t5000: skip "far in the future" test when time_t is too limited In-Reply-To: Message-ID: <31900a70120b443f90dd52b5fb653f62895b104d.1492771484.git.johannes.schindelin@gmx.de> References: User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Provags-ID: V03:K0:mis/18uJ/8fIKuAzXAFI292OYWbbO1Tm1qejYqWuEVDEZItYTw8 CHV3XuKVtq9OaEGLe8T2YJ5FtVwBPzMXTht23pf3pSMKnPZT0PAdVbQHax/y5htFOi/eC7V OK/kT3vLq/ldNTkukUG7TBzP1VMkmb2rdkof2JXXyynUGfljruli8MDJB1kgIUomt8pd6Nz 1U3pUDgCx+fqE/6QWxwXg== X-UI-Out-Filterresults: notjunk:1;V01:K0:2J0/9PlCzXU=:giZKFOjtpNjzJ9PTEZCdOl Y/M4v1g7/yX01eN7mdIB/283E7tUPSBxABWk4/YzUaUP019AkTDNum7O4LC3bdwmhXAqVj7fU dySfw2xPo0wnwiTRP/78vt2XSsSYSe/DTmIGp52EkGdK/kVtx6vso1Rv9a3ZsHolUZiEeB0u1 +7PxJMnQYZuklYwUxdeUNP2D6lI8uQ9CI042h2ZsKeShUcxspc6WDqn+aLcaEWiO9kxlNkqPs 6HfdNVyfS7+bzAYi0yb6E5N4qHbyQJMq50FsZxr9oniO6OJ0jPkNs7GRG4Yv8yn8Ebrk7QT32 COl5FEYE7kLELMrx51vO+IqpCgLYAe40Q8bliI6fQ5uTnMgjMlmttzKVvm2g4AgnxdBHE8Mzc dI+IM0zqZTUPrJgI7ZxMe582QhdLm9ZcpwrJZ0Gtwc4IjGBgiGzgy+UvXd9dFK6hta09tvK1J uLn8gjj9QDgFyZW5uv32H98cutde6RQy+BBMRb8Si+nCXx54DCyjVES0n0Dz77o+UprVU2Z70 +1bq53tTrSA1GvTi3Y3RJ1/b9WC3jbzYRdgjOM4UuXXJLogaHxkkK8GTxB95/DdUz01PY2Jme 0UEMPe4SQvqFNdRs08QC6m/s4ARNDKgApgLZo38WNCVpUjo9j9Fw/8ThWl32/l212+N55SheH +E0SWvkLaD7Pl5J6hDgP6LF8TZZB/3ah1AEoddokIr596uXyf6PCziw2XQroPGT3dxCECB4WO BBNlF8ApuOEwAg4SLUmtezSsR3gnigutJV6BdLkOibEaNBkYZlfFlOXN2X7FOafmT0Ix+uTN2 OBQv1wq Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Git's source code refers to timestamps as unsigned long, which is ill-defined, as there is no guarantee about the number of bits that data type has. In preparation of switching to another data type that is large enough to hold "far in the future" dates, we need to prepare the t0006-date.sh script for the case where we *still* cannot format those dates if the system library uses 32-bit time_t. Signed-off-by: Johannes Schindelin --- t/helper/test-date.c | 5 ++++- t/t0006-date.sh | 4 ++-- t/t5000-tar-tree.sh | 2 +- t/test-lib.sh | 1 + 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/t/helper/test-date.c b/t/helper/test-date.c index 4727bea255c..ac7c66c733b 100644 --- a/t/helper/test-date.c +++ b/t/helper/test-date.c @@ -5,7 +5,8 @@ static const char *usage_msg = "\n" " test-date show: [time_t]...\n" " test-date parse [date]...\n" " test-date approxidate [date]...\n" -" test-date is64bit\n"; +" test-date is64bit\n" +" test-date time_t-is64bit\n"; static void show_relative_dates(const char **argv, struct timeval *now) { @@ -96,6 +97,8 @@ int cmd_main(int argc, const char **argv) parse_approxidate(argv+1, &now); else if (!strcmp(*argv, "is64bit")) return sizeof(unsigned long) == 8 ? 0 : 1; + else if (!strcmp(*argv, "time_t-is64bit")) + return sizeof(time_t) == 8 ? 0 : 1; else usage(usage_msg); return 0; diff --git a/t/t0006-date.sh b/t/t0006-date.sh index 9539b425ffb..42d4ea61ef5 100755 --- a/t/t0006-date.sh +++ b/t/t0006-date.sh @@ -53,8 +53,8 @@ check_show unix-local "$TIME" '1466000000' # arbitrary time absurdly far in the future FUTURE="5758122296 -0400" -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" TIME_IS_64BIT +check_show iso "$FUTURE" "2152-06-19 18:24:56 -0400" TIME_IS_64BIT,TIME_T_IS_64BIT +check_show iso-local "$FUTURE" "2152-06-19 22:24:56 +0000" TIME_IS_64BIT,TIME_T_IS_64BIT check_parse() { echo "$1 -> $2" >expect diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh index 997aa9dea28..fe2d4f15a73 100755 --- a/t/t5000-tar-tree.sh +++ b/t/t5000-tar-tree.sh @@ -402,7 +402,7 @@ test_expect_success TIME_IS_64BIT 'generate tar with future mtime' ' git archive HEAD >future.tar ' -test_expect_success TAR_HUGE,TIME_IS_64BIT 'system tar can read our future mtime' ' +test_expect_success TAR_HUGE,TIME_IS_64BIT,TIME_T_IS_64BIT 'system tar can read our future mtime' ' echo 4147 >expect && tar_info future.tar | cut -d" " -f2 >actual && test_cmp expect actual diff --git a/t/test-lib.sh b/t/test-lib.sh index beee1d847ff..8d25cb7c183 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -1166,3 +1166,4 @@ test_lazy_prereq LONG_IS_64BIT ' ' test_lazy_prereq TIME_IS_64BIT 'test-date is64bit' +test_lazy_prereq TIME_T_IS_64BIT 'test-date time_t-is64bit' -- 2.12.2.windows.2.406.gd14a8f8640f