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.4 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 6B794207D6 for ; Mon, 24 Apr 2017 13:58:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1171917AbdDXN6P (ORCPT ); Mon, 24 Apr 2017 09:58:15 -0400 Received: from mout.gmx.net ([212.227.17.20]:54173 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1171907AbdDXN6E (ORCPT ); Mon, 24 Apr 2017 09:58:04 -0400 Received: from virtualbox ([95.208.59.55]) by mail.gmx.com (mrgmx103 [212.227.17.168]) with ESMTPSA (Nemesis) id 0LsTjw-1c16cB3JqS-011xP6; Mon, 24 Apr 2017 15:57:59 +0200 Date: Mon, 24 Apr 2017 15:57:58 +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 v5 2/8] t0006 & t5000: prepare for 64-bit timestamps In-Reply-To: Message-ID: <7a71eddcd9c27661c29673e32f8ff7167240aff8.1493042239.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:99PFpqPJ5Y/FioEinSWxPEofpnCR88ZkGXiBOiL8U3Xnz96WVXk QjUpfGEORNeHPUNs6sU7NTV7sgbV4Ur1WrWKghP2H3rK2KzROtDk0OCaC3a8THPAX3zcKcM A8+3+tvAgHJh3GCoplLz55MXD250hAtd8za9K1QbWf5MxPrxVejU+Zgefljt/StXaZrgj+9 w8bueBPIetd1MCe12vQfQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:upeP2de3P2c=:YNi9xwIW1yrd6YZFM25IpE LrVPibcL0bkahjv0MQTj2cg8WbffDkkPZWz2ORAncRXd4aP85e1tK0v+xN26T4F/3MJ097pEJ H2Y3SgR6eloeH5d21ptO4RR2vouY9zAkayG4woiBN/hQlgxl8m4oP7I4me+WFzmj9AxXjKaRl gRX11ZAnwNKXgostq1P9mK+JaPVw1Al7RzF3AURfAoqpxxj3Ei9sM/oo+FxJ82irB2mhc5nkn 3ySk1FRXXoWIyv6qBcf+zdHSqYdnzrY43950MHoClsmaQ3fDhv955HEZ5XiRn+Ug1hNFV4fEC RVGuyX1e3N5fTuCPD2TXTU0nvnjVadNkCNiYolSbRM/1YrJnApDClt6iTnIBibklZFNqnTG5V XPfn4xLD2Nw1AdsWeIKWSUZDqVTQbQxtF+v/1L3otiwXdCdPMFwxJooJLeAF/kX7g6BTn+uZv H4qZ4KFTDztoXb5PGmt8BalcWb7yiLYnLyd+0cxmQOVsVdxP3nsaOoCQ04GZlUjMngj93H6YK MlKkdn5FWy3hhsSDGgXBQAx3O2IWU+xyyQlfYpkeFthr2rS1pzsUzM0VNaiLov97E6jR0LImK Nj9Rak7cBIgTCbEm8iQxMBfv6mZtrQJkVDYCMRu5Y8E15PubTymh/4/gOwX37AOXAG++9301w FTWmuXuH2OpTwFKOxbq3cV0jFdixdrJYZ7M7MYO+FayqhIO5z/1jIrnxcKPdAYy30rILcfcXv S3q1RwIANL092zyibr0ZF9aN3QrECvJUTRlKmFne7Lz3jBzGc7+TttDJk2B6dC8F0H6iJ/Svk 1+kp3xD 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 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 6b9c38e14cd (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 --- t/helper/test-date.c | 5 ++++- t/t0006-date.sh | 4 ++-- t/t5000-tar-tree.sh | 6 +++--- t/test-lib.sh | 2 ++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/t/helper/test-date.c b/t/helper/test-date.c index 506054bcd5d..4727bea255c 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: [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(const char **argv, struct timeval *now) { @@ -93,6 +94,8 @@ int cmd_main(int argc, const 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 c0c910867d7..9539b425ffb 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" LONG_IS_64BIT -check_show iso-local "$FUTURE" "2152-06-19 22:24:56 +0000" 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" TIME_IS_64BIT check_parse() { echo "$1 -> $2" >expect diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh index 886b6953e40..997aa9dea28 100755 --- a/t/t5000-tar-tree.sh +++ b/t/t5000-tar-tree.sh @@ -390,7 +390,7 @@ test_expect_success TAR_HUGE,LONG_IS_64BIT 'system tar can read our huge size' ' 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 && echo content >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" ' -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 ' -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 && 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 13b5696822d..beee1d847ff 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -1164,3 +1164,5 @@ build_option () { test_lazy_prereq LONG_IS_64BIT ' test 8 -le "$(build_option sizeof-long)" ' + +test_lazy_prereq TIME_IS_64BIT 'test-date is64bit' -- 2.12.2.windows.2.406.gd14a8f8640f