From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.3 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id A172E1F62E for ; Wed, 16 Jan 2019 13:36:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393263AbfAPNgl (ORCPT ); Wed, 16 Jan 2019 08:36:41 -0500 Received: from mail-ed1-f47.google.com ([209.85.208.47]:37420 "EHLO mail-ed1-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2393214AbfAPNg0 (ORCPT ); Wed, 16 Jan 2019 08:36:26 -0500 Received: by mail-ed1-f47.google.com with SMTP id h15so5437647edb.4 for ; Wed, 16 Jan 2019 05:36:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=qFU9SlpnDsxWdLk7t1RD4T2tVhhrbl/R3qfgIkC/7lI=; b=vdNFFLaQzUFGrzKBUY8Qmwne3VEtm9VJsu/PJDfsh/JUgXJ/x9uMSPh+AOA7489SFC L4m3gNYZhqkyBY4UGMEudNOOid2M9fDczWJ/q9/T3Tcm9b9eftt+NLqs3qB/TH9jonBi SLEjc5hKuSzjtQktB82THtEB/kMZ2AFWcxo0b8SZutqhJyrsmRyKLa1TAw6NZ2S+tuIg adimhZ7nVE7GJBVq6bsZJplPLQVFMdwZsKcFOkyTs7PRXckLSBhpALFQs1pbiEhgNzM2 dag2wdS9BgdoPVADJAwbGbERJjxfj42u2CM4ErGslBhND6oc3IhjIROxHtDSGDBL24bh OPsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=qFU9SlpnDsxWdLk7t1RD4T2tVhhrbl/R3qfgIkC/7lI=; b=lX3g9cZCSpO0cszfKUZCjt9ZhtoiaXYTseuwvIU6pbp7Hz2m1CNyvhjWkr6m3nLjxS eiT2G4ffSIskAIrUlBej7daMClUVq15vh/6bKE1nfJhGrUogsTMZsPxUCrIX/TQ0lJ5S 8zbpJUfqxGBqJyKwEDMgI13Y6OF3HYjW7sLI2cl2VZeEKWEROxKpb9znJbe0xF2QYFeI qyiOY5BQmZ85/gXYzHXekZ8zgMZCly6u65JPocNIJwcuDOhYI+U3wPmz7M05wv4fQR5y My140Y5SBXpB9Da1nrfiyGadfhH8+aXqDFhxG+P1ILeSeL2UR3PhhNRrFquZBnewb0y1 eTEw== X-Gm-Message-State: AJcUukfJWVT3WTpgk1mxaNVCMyH2lKCVAPAFwN9kwv/s02RCEeH52vKL a8ccMg8uuAQGRi4JbgW4+7Ij/ErT X-Google-Smtp-Source: ALg8bN6nT5xkmvE0ZyoOMlsgtzjA/yRaq+LdcLX7c7iXwSVxLcgJynvhIn0KRXf8g9sZfxXnmpvvGg== X-Received: by 2002:a17:906:7b97:: with SMTP id s23-v6mr6950656ejo.57.1547645784368; Wed, 16 Jan 2019 05:36:24 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id r7-v6sm3063523ejs.36.2019.01.16.05.36.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 05:36:23 -0800 (PST) Date: Wed, 16 Jan 2019 05:36:23 -0800 (PST) X-Google-Original-Date: Wed, 16 Jan 2019 13:36:02 GMT Message-Id: <0d547db8f75fa38223712355b6f7152acd3254a4.1547645770.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH v3 14/21] tests: avoid calling Perl just to determine file sizes Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Johannes Schindelin Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin It is a bit ridiculous to spin up a full-blown Perl instance (especially on Windows, where that means spinning up a full POSIX emulation layer, AKA the MSYS2 runtime) just to tell how large a given file is. So let's just use the test-tool to do that job instead. This command will also be used over the next commits, to allow for cutting out individual test cases' verbose log from the file generated via --verbose-log. Signed-off-by: Johannes Schindelin --- t/helper/test-path-utils.c | 12 ++++++++++++ t/t0021-conversion.sh | 2 +- t/t1050-large.sh | 2 +- t/t5315-pack-objects-compression.sh | 2 +- t/t9303-fast-import-compression.sh | 2 +- 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/t/helper/test-path-utils.c b/t/helper/test-path-utils.c index ae091d9b3e..30211d6d64 100644 --- a/t/helper/test-path-utils.c +++ b/t/helper/test-path-utils.c @@ -291,6 +291,18 @@ int cmd__path_utils(int argc, const char **argv) return !!res; } + if (argc > 2 && !strcmp(argv[1], "file-size")) { + int res = 0, i; + struct stat st; + + for (i = 2; i < argc; i++) + if (stat(argv[i], &st)) + res = error_errno("Cannot stat '%s'", argv[i]); + else + printf("%"PRIuMAX"\n", (uintmax_t)st.st_size); + return !!res; + } + fprintf(stderr, "%s: unknown function name: %s\n", argv[0], argv[1] ? argv[1] : "(there was none)"); return 1; diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh index fd5f1ac649..e10f5f787f 100755 --- a/t/t0021-conversion.sh +++ b/t/t0021-conversion.sh @@ -24,7 +24,7 @@ generate_random_characters () { } file_size () { - perl -e 'print -s $ARGV[0]' "$1" + test-tool path-utils file-size "$1" } filter_git () { diff --git a/t/t1050-large.sh b/t/t1050-large.sh index 1a9b21b293..dcb4dbba67 100755 --- a/t/t1050-large.sh +++ b/t/t1050-large.sh @@ -8,7 +8,7 @@ test_description='adding and checking out large blobs' # This should be moved to test-lib.sh together with the # copy in t0021 after both topics have graduated to 'master'. file_size () { - perl -e 'print -s $ARGV[0]' "$1" + test-tool path-utils file-size "$1" } test_expect_success setup ' diff --git a/t/t5315-pack-objects-compression.sh b/t/t5315-pack-objects-compression.sh index 34c47dae09..df970d7584 100755 --- a/t/t5315-pack-objects-compression.sh +++ b/t/t5315-pack-objects-compression.sh @@ -7,7 +7,7 @@ test_description='pack-object compression configuration' # This should be moved to test-lib.sh together with the # copy in t0021 after both topics have graduated to 'master'. file_size () { - perl -e 'print -s $ARGV[0]' "$1" + test-tool path-utils file-size "$1" } test_expect_success setup ' diff --git a/t/t9303-fast-import-compression.sh b/t/t9303-fast-import-compression.sh index 856219f46a..5045f02a53 100755 --- a/t/t9303-fast-import-compression.sh +++ b/t/t9303-fast-import-compression.sh @@ -6,7 +6,7 @@ test_description='compression setting of fast-import utility' # This should be moved to test-lib.sh together with the # copy in t0021 after both topics have graduated to 'master'. file_size () { - perl -e 'print -s $ARGV[0]' "$1" + test-tool path-utils file-size "$1" } import_large () { -- gitgitgadget