From patchwork Tue Oct 13 19:19:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elijah Newren X-Patchwork-Id: 11836073 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 14E78C433DF for ; Tue, 13 Oct 2020 19:19:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A249220BED for ; Tue, 13 Oct 2020 19:19:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bGThcJgb" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726202AbgJMTTv (ORCPT ); Tue, 13 Oct 2020 15:19:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52602 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726019AbgJMTTv (ORCPT ); Tue, 13 Oct 2020 15:19:51 -0400 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB55DC0613D2 for ; Tue, 13 Oct 2020 12:19:50 -0700 (PDT) Received: by mail-wr1-x42d.google.com with SMTP id n6so639843wrm.13 for ; Tue, 13 Oct 2020 12:19:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=YuNJdO9pR0bHiFnx6lSI0tlgkHGMuxw9CKtpl6ZZQ7o=; b=bGThcJgbimKHGhIXRvznCTNTNuSD5/aU/nXSU2WpPo/SNWiYSk1SEHBPSnsu9yxetG AGxagIkWBoOA74CSgE6lRfBXLyYNRqYM9/AzK7R8ffE1dL4WnjE7LxOTPBbkt6xw02VT msDBM1bH4uxDm8vYMu3gFCvzZ8LhqgR8dw1rw+1c9pbjFozUDzIm/dPlBBYJoiN0oPSq CAQX3LJ3C9MzhlOFC8HZDBAWzNAgNe3R5/yOL96e7ol3GXv1B2YCxLc84u9gZxCcoYgc dwEp9rPF2OaKUTKqK4aaaHEmA3rYclzCtvt3GFfpQg4w0un3tktYVP4E4CMRZrrENiYU 9DjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=YuNJdO9pR0bHiFnx6lSI0tlgkHGMuxw9CKtpl6ZZQ7o=; b=idtT5qKjDW15HPb5XOLH6Qc/diNv+2AzxMcKMXSRfgz+mrfDtl9uRiXXy9ztaCp1vc wa8ui8aEKg6wnrQn7QIENOWZk2heYXBWHiVb6PkCyu/vVVIf9kDtGatJmdjE+0KIUrYY UZIKBrclrMaZb8eR2txXCuPeb8ImqsQBkIbcEht/Ee2fZ/sDlLrZthmTfQewERU9AwjH bStd6LN88NWBsY8pIVQ12dbgWX4w/TBH0k/9cYMpxidrhleKjKCvs9xm4euu1iyT1F3e CUu3/dZyLDEHkq5FuI7c80QavhYdLk+7aas4mOGwVCKTymjZOY2kNRP7nmDmgpoRqy6i lNaw== X-Gm-Message-State: AOAM532ttbYNAY/ttSXePCLtPbFr1Mro8txEkjogwmwrAW7wLGNnSoPE Tmd+xqkuzbbxW79nhLAg94o1Wr3W8No= X-Google-Smtp-Source: ABdhPJzCpbBEOcwc85RUXmkWosslef6W/URI5HJBrigq29JHf4afUPmRxhGr5Tpcy5bfCOM1OuLLjw== X-Received: by 2002:a5d:4409:: with SMTP id z9mr1281148wrq.236.1602616789179; Tue, 13 Oct 2020 12:19:49 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id j5sm669085wrx.88.2020.10.13.12.19.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2020 12:19:48 -0700 (PDT) Message-Id: <41e2528e83ba7087c9d21f0b15efed416f1512f8.1602616786.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Tue, 13 Oct 2020 19:19:44 +0000 Subject: [PATCH v2 1/3] test-lib: allow selecting tests by substring/regex with --run Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Phillip Wood , Taylor Blau , Elijah Newren , Elijah Newren , Elijah Newren Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Elijah Newren From: Elijah Newren Many of our test scripts have several "setup" tests. It's a lot easier to say ./t0050-filesystem.sh --run=setup,9 in order to run all the setup tests as well as test #9, than it is to track down what all the setup tests are and enter all their numbers in the list. Also, I often find myself wanting to run just one or a couple tests from the test file, but I don't know the numbering of any of the tests -- to get it I either have to first run the whole test file (or start counting by hand or figure out some other clever but non-obvious tricks). It's really convenient to be able to just look at the test description(s) and then run ./t6416-recursive-corner-cases.sh --run=symlink or ./t6402-merge-rename.sh --run='setup,unnecessary update' Add such an ability to test selection which relies on merely matching against the test description. Signed-off-by: Elijah Newren --- t/README | 29 +++++++++++++++++++---------- t/t0000-basic.sh | 41 +++++++++++++++++++++++++---------------- t/test-lib.sh | 13 +++++++------ 3 files changed, 51 insertions(+), 32 deletions(-) diff --git a/t/README b/t/README index 2adaf7c2d2..5fd8eaf595 100644 --- a/t/README +++ b/t/README @@ -258,16 +258,13 @@ For an individual test suite --run could be used to specify that only some tests should be run or that some tests should be excluded from a run. -The argument for --run is a list of individual test numbers or -ranges with an optional negation prefix that define what tests in -a test suite to include in the run. A range is two numbers -separated with a dash and matches a range of tests with both ends -been included. You may omit the first or the second number to -mean "from the first test" or "up to the very last test" -respectively. - -Optional prefix of '!' means that the test or a range of tests -should be excluded from the run. +The argument for --run, , is a list of description +substrings or regexes or individual test numbers or ranges with an +optional negation prefix (of '!') that define what tests in a test +suite to include (or exclude, if negated) in the run. A range is two +numbers separated with a dash and matches a range of tests with both +ends been included. You may omit the first or the second number to +mean "from the first test" or "up to the very last test" respectively. If --run starts with an unprefixed number or range the initial set of tests to run is empty. If the first item starts with '!' @@ -317,6 +314,18 @@ test in the test suite except from 7 up to 11: $ sh ./t9200-git-cvsexport-commit.sh --run='!7-11' +Sometimes there may be multiple tests with e.g. "setup" in their name +that are needed and rather than figuring out the number for all of them +we can just use "setup" as a substring/regex to match against the test +description: + + $ sh ./t0050-filesystem.sh --run=setup,9-11 + +or one could select both the setup tests and the rename ones (assuming all +relevant tests had those words in their descriptions): + + $ sh ./t0050-filesystem.sh --run=setup,rename + Some tests in a test suite rely on the previous tests performing certain actions, specifically some tests are designated as "setup" test, so you cannot _arbitrarily_ disable one test and diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh index 923281af93..07105b2078 100755 --- a/t/t0000-basic.sh +++ b/t/t0000-basic.sh @@ -705,7 +705,31 @@ test_expect_success '--run empty selectors' " EOF " -test_expect_success '--run invalid range start' " +test_expect_success '--run substring selector' " + run_sub_test_lib_test run-substring-selector \ + '--run empty selectors' \ + --run='relevant' <<-\\EOF && + test_expect_success \"relevant test\" 'true' + for i in 1 2 3 4 5 6 + do + test_expect_success \"other test #\$i\" 'true' + done + test_done + EOF + check_sub_test_lib_test run-substring-selector <<-\\EOF + > ok 1 - relevant test + > ok 2 # skip other test #1 (--run) + > ok 3 # skip other test #2 (--run) + > ok 4 # skip other test #3 (--run) + > ok 5 # skip other test #4 (--run) + > ok 6 # skip other test #5 (--run) + > ok 7 # skip other test #6 (--run) + > # passed all 7 test(s) + > 1..7 + EOF +" + +test_expect_success '--run keyword selection' " run_sub_test_lib_test_err run-inv-range-start \ '--run invalid range start' \ --run='a-5' <<-\\EOF && @@ -735,21 +759,6 @@ test_expect_success '--run invalid range end' " EOF_ERR " -test_expect_success '--run invalid selector' " - run_sub_test_lib_test_err run-inv-selector \ - '--run invalid selector' \ - --run='1?' <<-\\EOF && - test_expect_success \"passing test #1\" 'true' - test_done - EOF - check_sub_test_lib_test_err run-inv-selector \ - <<-\\EOF_OUT 3<<-\\EOF_ERR - > FATAL: Unexpected exit with code 1 - EOF_OUT - > error: --run: invalid non-numeric in test selector: '1?' - EOF_ERR -" - test_set_prereq HAVEIT haveit=no diff --git a/t/test-lib.sh b/t/test-lib.sh index ef31f40037..2aca398e1e 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -769,6 +769,8 @@ match_pattern_list () { } match_test_selector_list () { + operation="$1" + shift title="$1" shift arg="$1" @@ -805,13 +807,13 @@ match_test_selector_list () { *-*) if expr "z${selector%%-*}" : "z[0-9]*[^0-9]" >/dev/null then - echo "error: $title: invalid non-numeric in range" \ + echo "error: $operation: invalid non-numeric in range" \ "start: '$orig_selector'" >&2 exit 1 fi if expr "z${selector#*-}" : "z[0-9]*[^0-9]" >/dev/null then - echo "error: $title: invalid non-numeric in range" \ + echo "error: $operation: invalid non-numeric in range" \ "end: '$orig_selector'" >&2 exit 1 fi @@ -819,9 +821,8 @@ match_test_selector_list () { *) if expr "z$selector" : "z[0-9]*[^0-9]" >/dev/null then - echo "error: $title: invalid non-numeric in test" \ - "selector: '$orig_selector'" >&2 - exit 1 + echo "$title" | grep -q "$selector" && return + continue fi esac @@ -1031,7 +1032,7 @@ test_skip () { skipped_reason="GIT_SKIP_TESTS" fi if test -z "$to_skip" && test -n "$run_list" && - ! match_test_selector_list '--run' $test_count "$run_list" + ! match_test_selector_list '--run' "$1" $test_count "$run_list" then to_skip=t skipped_reason="--run" From patchwork Mon Oct 12 23:26:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elijah Newren X-Patchwork-Id: 11834471 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 37024C433DF for ; Mon, 12 Oct 2020 23:27:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E737C20878 for ; Mon, 12 Oct 2020 23:27:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="r74hAoUt" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732261AbgJLX0P (ORCPT ); Mon, 12 Oct 2020 19:26:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37572 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732248AbgJLX0L (ORCPT ); Mon, 12 Oct 2020 19:26:11 -0400 Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C11C8C0613D0 for ; Mon, 12 Oct 2020 16:26:08 -0700 (PDT) Received: by mail-wm1-x341.google.com with SMTP id d3so19571886wma.4 for ; Mon, 12 Oct 2020 16:26:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=CzrCPnbUvNSakWF2bvkdGZ4dwzkAgsYCMdLnhb7Mw8c=; b=r74hAoUtv07NVZqMhBvtHGhgS4Y6Nhi3x4HXo0gqHS/nUbEMThv96ZBeMsxfHiROWb zr2pbFMmrzV5jmfN+20r8W0pxc+FD9IWPu1CFlpijxyyAThCuNlIoIA/qlJ0UtvZrInF K5RCqpxYkyZ1Gl+gWbRnED56QlNjmvjqgTPKBLx04Tc2xtjBqnED+MCoRn0A3XkQgurK ZVbDSOGJXAsDvJc2/TxEF732Q1Y/TUawXBa3EW5KyMYPHpwP2REytI13/qlLd0/BZvc+ pCh9ooOmIIuogbxosT4aECkTNfXt11IEaWZMlymo74NP+WRDX1NWuMoAu2n8G6Tp0KlV 0bYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=CzrCPnbUvNSakWF2bvkdGZ4dwzkAgsYCMdLnhb7Mw8c=; b=dNVOtl5et/jmWnrAQR3cz9HIZm9WTbRusunkpwNkFAxRA8Km9EYIlvxCGf1vlDKLyh v0j4kuHUIP58MuGBj6wM0CXXGBcMkxjZ6iDIIPbjw87uc8B/nokGJC5B+Lyoyta98cob 6m8m8pxGuYHxVTucs2bANOk7CWKsoW0RU3G2iCm6/l2ytlWLuTcJM9Oe7KEKz6yGYSkT 3ZrT9NVn0DRZpWA3T5uGDlKprGhVdnSaQ5VK1bBVe6KFhp7TO9LBInBb2AylMdWXPT8L jsFe78cTKOUTctdA0YnH3JOrtHmlZGh222LHUUggZx7naet+YKNCZO1P5n9LYvUrh87h Ou2A== X-Gm-Message-State: AOAM533f8nulu+2SxeG60AmkaaYqc4Ov9xsOZB52ots4tuJozimkN3iS 0LSE6b+T/Fg6/2U0O9cJnm3LT2ytd2o= X-Google-Smtp-Source: ABdhPJwPvesZtj30PY/BFUjDt6u+RdGIXhZns2iYXlWvl5zrVyFRaEEzr/p5GvvPQ2+ZOxCLCHKO5Q== X-Received: by 2002:a1c:7d54:: with SMTP id y81mr12179203wmc.114.1602545167263; Mon, 12 Oct 2020 16:26:07 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id f14sm27707016wrt.53.2020.10.12.16.26.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Oct 2020 16:26:06 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Mon, 12 Oct 2020 23:26:03 +0000 Subject: [PATCH 2/3] t6006, t6012: adjust tests to use 'setup' instead of synonyms Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Elijah Newren , Elijah Newren Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Elijah Newren From: Elijah Newren With the new ability to pass --run=setup to select which tests to run, it is more convenient if tests use the term "setup" instead of synonyms like 'prepare' or 'rebuild'. There are undoubtedly many other tests in our testsuite that could be changed over too, these are just a couple that I ran into. Signed-off-by: Elijah Newren --- t/t6006-rev-list-format.sh | 2 +- t/t6012-rev-list-simplify.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh index bc95da8a5f..99a1eaf332 100755 --- a/t/t6006-rev-list-format.sh +++ b/t/t6006-rev-list-format.sh @@ -339,7 +339,7 @@ commit $head1 .. (hinzugef${added_utf8_part_iso88591}gt) foo EOF -test_expect_success 'prepare expected messages (for test %b)' ' +test_expect_success 'setup expected messages (for test %b)' ' cat <<-EOF >expected.utf-8 && commit $head3 This commit message is much longer than the others, diff --git a/t/t6012-rev-list-simplify.sh b/t/t6012-rev-list-simplify.sh index b6fa43ace0..7254060240 100755 --- a/t/t6012-rev-list-simplify.sh +++ b/t/t6012-rev-list-simplify.sh @@ -168,7 +168,7 @@ test_expect_success '--full-diff is not affected by --parents' ' # # This example is explained in Documentation/rev-list-options.txt -test_expect_success 'rebuild repo' ' +test_expect_success 'setup rebuild repo' ' rm -rf .git * && git init && git switch -c main && From patchwork Tue Oct 13 19:19:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elijah Newren X-Patchwork-Id: 11836071 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C050CC433DF for ; Tue, 13 Oct 2020 19:19:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6B760208D5 for ; Tue, 13 Oct 2020 19:19:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="jZQBndSS" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726247AbgJMTTz (ORCPT ); Tue, 13 Oct 2020 15:19:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52608 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725919AbgJMTTy (ORCPT ); Tue, 13 Oct 2020 15:19:54 -0400 Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F4D3C0613D0 for ; Tue, 13 Oct 2020 12:19:52 -0700 (PDT) Received: by mail-wr1-x444.google.com with SMTP id h7so709416wre.4 for ; Tue, 13 Oct 2020 12:19:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=R09JXklHb8YizcU80FIgE+G/eYi/IPb9/aJRu6H3vcw=; b=jZQBndSSP68vAjkPbbBUYyNdXoFrAhW9UjEEQEIj++JdW63M1CBkBjxt2h6Ua3TCr3 IfBFz2BWFKgmeiXfqLf1mp7Sz2q8UTur8WGWsjN8m25VcdwC9iDCVoBsokcah4YGG+uT ksNVVNSJHavGLrPQJlRU9OjVb2iuJKHYR1PoWGbLyaWZtjhcIaFv3idyIGWdYEUMQb3S Ik/0r//cXuuOgsN5tnlrHrunbuq7fa8DwNJKWckYLM4DXJpZdp+KFWC3k5blnndI0v6X M+HsoxGHng8jBS0MbWIkTtJoiLDPpeV+ne5Yal544Z4gpdz8CtzgDM7REaCviaoidKRq sT+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=R09JXklHb8YizcU80FIgE+G/eYi/IPb9/aJRu6H3vcw=; b=IiFUlO7KPSUeAwV9cOFOZ4u4eTQaQzPWyKCfvw+SRX599qjVFF1/WdD3vxC7vUUaVD hSUgP8TSPb9EwkZGBf+V6OxtKMBpCPOadzT6kXyIPaSn4umLAkhn4qjhkzGKrKHKpuCZ d6kbrHE75PqzFjn6rBeSqMAclzGYSMQVhqO0xBPGbXkJg5PsCq/SZDavxoMzJNoXAFad QyUL8FIMAi7iYbBH2LEjE9lDyWBXaY/UtzaqEg0yj67/nK0HqhJs6jJ5aQJLJI+MzViY obZnLLSo80FxQVVmGxJfLjA2yFGikdZZ/3e1Eh3kXzO2wyke9hGfrzfLBi0gNf1Q4TMN hdxg== X-Gm-Message-State: AOAM532jcrVz46zskFvEPLkj2H7lrFHfe8hTdwwYiXOvta6kAOrRe1Ew zlnBB3zYPYHvoK7U7DVLXleGlxJs9GI= X-Google-Smtp-Source: ABdhPJx2oxjEP73hNUJny19nW5RznPuWeJkx1TNME8wE22SeMicaqKB0iv63aT4H03SucBXy/vb8aA== X-Received: by 2002:adf:ca13:: with SMTP id o19mr1319143wrh.206.1602616791198; Tue, 13 Oct 2020 12:19:51 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id q5sm692651wrs.54.2020.10.13.12.19.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2020 12:19:50 -0700 (PDT) Message-Id: <85a4ca164a9f665016d4aad0f29cbef6f62f36b0.1602616786.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Tue, 13 Oct 2020 19:19:46 +0000 Subject: [PATCH v2 3/3] test-lib: reduce verbosity of skipped tests Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Phillip Wood , Taylor Blau , Elijah Newren , Elijah Newren , Elijah Newren Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Elijah Newren From: Elijah Newren When using the --run flag to run just two or three tests from a test file which contains several dozen tests, having every skipped test print out dozens of lines of output for the test code for that skipped test adds up to hundreds or thousands of lines of irrelevant output that make it very hard to fish out the relevant results you were looking for. Simplify the output for skipped tests down to just showing the one-line descriptions. Signed-off-by: Elijah Newren --- t/test-lib.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/t/test-lib.sh b/t/test-lib.sh index 2aca398e1e..fe81d9c733 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -1059,7 +1059,6 @@ test_skip () { " " fi - say_color skip >&3 "skipping test: $@" say_color skip "ok $test_count # skip $1 ($skipped_reason)" : true ;;