From mboxrd@z Thu Jan 1 00:00:00 1970 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 8790AC43217 for ; Wed, 2 Mar 2022 17:28:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243875AbiCBR27 (ORCPT ); Wed, 2 Mar 2022 12:28:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59812 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243834AbiCBR2b (ORCPT ); Wed, 2 Mar 2022 12:28:31 -0500 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E8B8410FD4 for ; Wed, 2 Mar 2022 09:27:39 -0800 (PST) Received: by mail-wr1-x42e.google.com with SMTP id j17so3969432wrc.0 for ; Wed, 02 Mar 2022 09:27:39 -0800 (PST) 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=dS4moiO4CP3GF1mdLM6VHA4wDT9p/lCoym4zQZrn5KM=; b=Tt1ZCgFmWwDiORV4w570/MUCwzrq8mK6aVl3lT4/Ekhu2wrLisTqD94ImMhFkOl7ES xYW22NaMyVGTFKOATCwodbhXmOW5Rq0efb0hcFufTGh5Jqubp3uAvEqk7WX7SaC7lBw6 CWz52yFXaB2u9gX88PZCZq4xdAOH82Ha9CZfpxGvacdx74DRNAB4KQ6glTQvQ6muAsoL PmYmEdVvChIesw0xW8IwdcZJ5EDfOHTzsd9fEkknBzlLKnyvb2TSLJDBW8ZdN2zhnnWO bIPLt+S4TtiqhLOQaW342UCDQYDsCxRffiMDDTv9J8Hn50s2MVNG2U9pIpvW9A/bYCse +9Mg== 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=dS4moiO4CP3GF1mdLM6VHA4wDT9p/lCoym4zQZrn5KM=; b=cihXCK3Icxw178EhI1gC5NKRUU6mdPCasxdO3b/hJP8ca2D9fGVI4rsi2kzHj/jhyS +uVQojwQRRaQeuYjgJMTOGz6NM+JaCqH5DUy8NRBhT1BBy0EsAiEvargZoNIj6CGixYb EwXkgjg/lePMQr+xJ6ydO7hSYfluzJfmpc4us0MY5yP9tqGX0TG5RFTN2mkf2Ri0wfRB 5gKXzKWANUr/rx2ujZWPCc8l5OEX4MzpqRvakP7oRlHxvFDMecSBEHsoo1neh9lzGU9f 9rJL8r6v7NoilakgY5qRWg1T3qZmCB335vVfovPp3fzCyd6Lx0COuM3aQPp8EAj+R55G +mNg== X-Gm-Message-State: AOAM532wn8ntNI4pVp3YrJxFblWpOIyF5BO0FJsTHvNLEMs50Sv/eG+b WvVeHM5WY/DtsSrqrYgOJiSs0Afz0DCmdw== X-Google-Smtp-Source: ABdhPJyabrcAgqlryUwRplGZOM7kyh/CMF6ohdcLXxVeUz4OT+y3/ItL2Y7e01JnSiU/KJRgDfm3zw== X-Received: by 2002:adf:e444:0:b0:1ef:caa9:b980 with SMTP id t4-20020adfe444000000b001efcaa9b980mr12306438wrm.549.1646242057896; Wed, 02 Mar 2022 09:27:37 -0800 (PST) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id r20-20020adfa154000000b001f0326a23e1sm2537377wrr.88.2022.03.02.09.27.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Mar 2022 09:27:37 -0800 (PST) From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= To: git@vger.kernel.org Cc: Junio C Hamano , Shubham Mishra , Christian Couder , Taylor Blau , =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Subject: [PATCH 09/15] notes tests: don't ignore "git" exit code Date: Wed, 2 Mar 2022 18:27:18 +0100 Message-Id: X-Mailer: git-send-email 2.35.1.1226.g8b497615d32 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Change a fragile test pattern that's been with us ever since these tests were introduced in [1], [2] and [3] to properly return the exit code of the failing command on failure. Because of this I'd marked this test as passing under SANITIZE=leak in [4] and [5]. We need to remove those annotations as these tests will no longer pass. 1. 9081a421a6d (checkout: fix "branch info" memory leaks, 2021-11-16) 2. 0057c0917d3 (Add selftests verifying that we can parse notes trees with various fanouts, 2009-10-09) 3. 048cdd4665e (t3305: Verify that adding many notes with git-notes triggers increased fanout, 2010-02-13) 4. ca089724952 (leak tests: mark some notes tests as passing with SANITIZE=leak, 2021-10-31) 5. 9081a421a6d (checkout: fix "branch info" memory leaks, 2021-11-16) --- t/t3302-notes-index-expensive.sh | 6 +++--- t/t3303-notes-subtrees.sh | 9 ++++----- t/t3305-notes-fanout.sh | 14 +++++++------- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/t/t3302-notes-index-expensive.sh b/t/t3302-notes-index-expensive.sh index bc9d8ee1e6a..bb5fea02a03 100755 --- a/t/t3302-notes-index-expensive.sh +++ b/t/t3302-notes-index-expensive.sh @@ -8,7 +8,6 @@ test_description='Test commit notes index (expensive!)' GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME -TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh create_repo () { @@ -65,7 +64,8 @@ create_repo () { test_notes () { count=$1 && git config core.notesRef refs/notes/commits && - git log | grep "^ " >output && + git log >tmp && + grep "^ " tmp >output && i=$count && while test $i -gt 0 do @@ -90,7 +90,7 @@ write_script time_notes <<\EOF unset GIT_NOTES_REF ;; esac - git log + git log || exit $? i=$(($i+1)) done >/dev/null EOF diff --git a/t/t3303-notes-subtrees.sh b/t/t3303-notes-subtrees.sh index 7e0a8960af8..eac193757bf 100755 --- a/t/t3303-notes-subtrees.sh +++ b/t/t3303-notes-subtrees.sh @@ -5,7 +5,6 @@ test_description='Test commit notes organized in subtrees' GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME -TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh number_of_commits=100 @@ -79,7 +78,7 @@ test_sha1_based () { ( start_note_commit && nr=$number_of_commits && - git rev-list refs/heads/main | + git rev-list refs/heads/main >out && while read sha1; do note_path=$(echo "$sha1" | sed "$1") cat <gfi && + git fast-import --quiet /dev/null | + git ls-tree -r --name-only $notes_commit | while read path do path_has_fanout $path $fanout || return 1 @@ -51,8 +50,9 @@ test_expect_success 'creating many notes with git-notes' ' done ' -test_expect_success 'many notes created correctly with git-notes' ' - git log | grep "^ " > output && +test_expect_success !SANITIZE_LEAK 'many notes created correctly with git-notes' ' + git log >output.raw && + grep "^ " output.raw >output && i=$num_notes && while test $i -gt 0 do @@ -91,13 +91,13 @@ test_expect_success 'stable fanout 0 is followed by stable fanout 1' ' test_expect_success 'deleting most notes with git-notes' ' remove_notes=285 && i=0 && - git rev-list HEAD | + git rev-list HEAD >revs && while test $i -lt $remove_notes && read sha1 do i=$(($i + 1)) && test_tick && - git notes remove "$sha1" 2>/dev/null || return 1 - done + git notes remove "$sha1" || return 1 + done