From patchwork Wed May 25 11:26:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12861046 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 02F10C433F5 for ; Wed, 25 May 2022 11:27:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241640AbiEYL1T (ORCPT ); Wed, 25 May 2022 07:27:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46630 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242478AbiEYL0p (ORCPT ); Wed, 25 May 2022 07:26:45 -0400 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 761139CF56 for ; Wed, 25 May 2022 04:26:32 -0700 (PDT) Received: by mail-wm1-x32b.google.com with SMTP id n124-20020a1c2782000000b003972dfca96cso3149300wmn.4 for ; Wed, 25 May 2022 04:26:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5Ijzhnwbw3Ka+BjRERq0RkApj89tBYfb60KCYdObH/w=; b=iDdcJM5DoMzP17dVuVw2YcM6sm8tArW5MPrZCQ7SIH2NWbmx62BAmPgnKQZymR6g8j jEnX8bEOTJw7Z8cGBRpjzbmIJtd37JDeHnmskhPRyFTbtvqo4vV+WlqO31jguQp6lqLt V+JMzqB7M4/aoXzfdXC1p3rF/bG8O/39XSkYCoucR0MndQgG4l2M+7D8zhyQC2wrcXXF ec96JxrEI1J9WMVbv+Emp9ug5aiielWDzHpxTJbvlRA2X/Gp1jGdXdjKQMi95rFztJzO zKqQ9keTC+bwBr5lT/9trbLz1IOfTuHORLz5zHxLDn+nHaKt8RucaQwUeGcs4yV16qpY OcWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5Ijzhnwbw3Ka+BjRERq0RkApj89tBYfb60KCYdObH/w=; b=Y6EBac4E1EDi/5GPfyR3pbHKBYALTFBqoHzKVuHRUV1jMIXnA9EAJhZoEHZ5BpYqMe jxEKo+0GftiVQST09+6SV9PEYygd83ZxnlreXTW0KX3P3xg9t23HtxkZrFljayWIuJA8 RtalKxU+jpjIf2Ep7BDaA/CT00KWCbyjYoRqNftHhUgd8l7cWDuxVmvX287nfw83hv99 s/ak5T+fk1SjXxcFCnGGpGwXjVWb8YmcD24WAGuq7v9Iyohe8oaS1S9w6H1b1yS8mGle UJgWD/LUqJYeFPrrXhS6HJ0xoanl9MF23yvQeoT+Ee6WJPe6l2qZse9xhCNqw/gVhd+p xT7A== X-Gm-Message-State: AOAM53177JnNsPF8nDYagabkjYwQ+pveQo4s7RJuFnKIo4ZY1ZZuT7X9 LhtoxyxEmfDF0o3YmdLa2FcTnBCSBGQ1Xw== X-Google-Smtp-Source: ABdhPJx/E5Si28gkP6NqNBkSmudoHrwiPP7zym1/t96zIdev1XXltZEacUNjwLleHWfx33DQauP9RQ== X-Received: by 2002:a7b:ce8a:0:b0:397:37c9:254a with SMTP id q10-20020a7bce8a000000b0039737c9254amr7803769wmj.96.1653477991758; Wed, 25 May 2022 04:26:31 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id z13-20020adfd0cd000000b0020d0dfcd10asm1851095wrh.65.2022.05.25.04.26.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 May 2022 04:26:31 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Taylor Blau , =?utf-8?q?SZEDER_G=C3=A1bor?= , =?utf-8?b?xJBvw6Bu?= =?utf-8?b?IFRy4bqnbiBDw7RuZyBEYW5o?= , =?utf-8?q?Car?= =?utf-8?q?lo_Marcelo_Arenas_Bel=C3=B3n?= , Johannes Schindelin , Victoria Dye , Matheus Tavares , Lars Schneider , Eric Sunshine , Johannes Schindelin , =?utf-8?b?w4Z2YXIgQXJu?= =?utf-8?b?ZmrDtnLDsCBCamFybWFzb24=?= Subject: [PATCH v6 12/14] ci: call `finalize_test_case_output` a little later Date: Wed, 25 May 2022 13:26:01 +0200 Message-Id: X-Mailer: git-send-email 2.36.1.1045.gf356b5617dd In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin We used to call that function already before printing the final verdict. However, now that we added grouping to the GitHub workflow output, we will want to include even that part in the collapsible group for that test case. Signed-off-by: Johannes Schindelin Signed-off-by: Ævar Arnfjörð Bjarmason --- t/test-lib.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/t/test-lib.sh b/t/test-lib.sh index 0a7e067ebdb..736c6447ecf 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -783,13 +783,13 @@ trap '{ code=$?; set +x; } 2>/dev/null; exit $code' INT TERM HUP # the test_expect_* functions instead. test_ok_ () { - finalize_test_case_output ok "$@" test_success=$(($test_success + 1)) say_color "" "ok $test_count - $@" + finalize_test_case_output ok "$@" } test_failure_ () { - finalize_test_case_output failure "$@" + failure_label=$1 test_failure=$(($test_failure + 1)) say_color error "not ok $test_count - $1" shift @@ -799,18 +799,19 @@ test_failure_ () { say_color error "1..$test_count" _error_exit fi + finalize_test_case_output failure "$failure_label" "$@" } test_known_broken_ok_ () { - finalize_test_case_output fixed "$@" test_fixed=$(($test_fixed+1)) say_color error "ok $test_count - $@ # TODO known breakage vanished" + finalize_test_case_output fixed "$@" } test_known_broken_failure_ () { - finalize_test_case_output broken "$@" test_broken=$(($test_broken+1)) say_color warn "not ok $test_count - $@ # TODO known breakage" + finalize_test_case_output broken "$@" } test_debug () { @@ -1136,10 +1137,10 @@ test_skip () { case "$to_skip" in t) - finalize_test_case_output skip "$@" say_color skip "ok $test_count # skip $1 ($skipped_reason)" : true + finalize_test_case_output skip "$@" ;; *) false