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: AS3215 2.6.0.0/16 X-Spam-Status: No, score=-3.4 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,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by dcvr.yhbt.net (Postfix) with ESMTP id 4B7751F727 for ; Thu, 30 Jun 2022 10:19:27 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="MM8CY7WF"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234589AbiF3KS7 (ORCPT ); Thu, 30 Jun 2022 06:18:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57528 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234520AbiF3KS5 (ORCPT ); Thu, 30 Jun 2022 06:18:57 -0400 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD1FC44765 for ; Thu, 30 Jun 2022 03:18:55 -0700 (PDT) Received: by mail-wm1-x32d.google.com with SMTP id l2-20020a05600c4f0200b0039c55c50482so1397713wmq.0 for ; Thu, 30 Jun 2022 03:18:55 -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=aEZFQkOqyYy1MZt3kx43+eLRYUgmjBXl1ASRhBSL+YU=; b=MM8CY7WFy9QO6Z1VGcvRx/C2cy1fJcvSMDUgNktnPL3HdjMWn+aueIH14JwKbJ70Na G0S/XOhxWSTKjVCZdcuNW6X9DpVgfCBHPq4gVPMU8abBiwgOJ2jHESJ+oYgw5+GcOS9O TKInXAg8UU7EibbQezd2CQ/h5Ez9nUs6MhVHMca3xeHPbLVUpxTvvnjPxWuDCBtTQKwF lwWEUFMcjTiq4egOIjUusOoWPHsZuU4JAHBG4e9EI36doh2x9spSOGJeOA36TaQo4kxM F2tDf96VLNTlcrkNmPwSZ5kfYncE3p1utypeuU48Dcc7tSZzvxXfhAa0vkrIUhxy3sIs VFdQ== 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=aEZFQkOqyYy1MZt3kx43+eLRYUgmjBXl1ASRhBSL+YU=; b=17QkJZLcwGh8sYRVhqUDVJxwKWFLmrIy7D5jgG0DIrWDQ6eUlHLlMdxXKGhIkXwQMT 7ABFmrUABp0xZ1Njm38mXSZhF23jl0IC5f0O+Y22VAPAN+6D8xDVV+tAAHt+z3eRTZv0 vizKBWAVUtdNy4yoD2+pqtCyKPHxVvovvt7GyXwlbrvVpqFY5wI7AYgGsdT1IMxDglTY Qi7gDRKvPr9//fV88iKi2JMqccpUh0OYTAo1jC44d0VfwkWTISfKVck/RXxA1Pt3ClR8 2ihLueOsRWI/mt7R+k/c0CX0yrOSqj0oYHwUFwe86qYejbS2Jf9S49ijfewTGkdR6csr QUTQ== X-Gm-Message-State: AJIora9KT46wmsFWb+yIBOfdS+fEnze6mbYqE8gtOk5b65EStt0o7vmU lCssBdTGerBXch05ixig6vR5T2oB7LoiBw== X-Google-Smtp-Source: AGRyM1vpEtcys1iFmIruGTrQgL6DVgvs3e/XA2AWz1aYCA4GAgEhPC+4IZHrCwv1uLj6JBf/0fvtkg== X-Received: by 2002:a05:600c:4149:b0:3a0:4728:60e7 with SMTP id h9-20020a05600c414900b003a0472860e7mr8981478wmm.10.1656584333923; Thu, 30 Jun 2022 03:18:53 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id m1-20020a7bcb81000000b003a05621dc53sm5978427wmi.29.2022.06.30.03.18.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jun 2022 03:18:53 -0700 (PDT) From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= To: git@vger.kernel.org Cc: Junio C Hamano , Derrick Stolee , rsbecker@nexbridge.com, =?UTF-8?q?SZEDER=20G=C3=A1bor?= , Johannes Sixt , Jeff King , =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Subject: [PATCH v2 1/3] tests: add missing double quotes to included library paths Date: Thu, 30 Jun 2022 12:18:34 +0200 Message-Id: X-Mailer: git-send-email 2.37.0.880.gf07d56b18ba In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Fix inclusion errors which would occur if the $TEST_DIRECTORY had $IFS whitespace in it. See d42bab442d7 (core.fsyncmethod: tests for batch mode, 2022-04-04) and a242c150ebb (vimdiff: integrate layout tests in the unit tests framework ('t' folder), 2022-03-30) for the two relevant commits. Both were first released with v2.37.0-rc0 (and were also part of v2.37.0). Signed-off-by: Ævar Arnfjörð Bjarmason --- t/t3700-add.sh | 2 +- t/t3903-stash.sh | 2 +- t/t7609-mergetool--lib.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/t/t3700-add.sh b/t/t3700-add.sh index 8979c8a5f03..8689b48589c 100755 --- a/t/t3700-add.sh +++ b/t/t3700-add.sh @@ -8,7 +8,7 @@ test_description='Test of git add, including the -- option.' TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh -. $TEST_DIRECTORY/lib-unique-files.sh +. "$TEST_DIRECTORY"/lib-unique-files.sh # Test the file mode "$1" of the file "$2" in the index. test_mode_in_index () { diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index 20e94881964..2a4c3fd61c0 100755 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh @@ -9,7 +9,7 @@ GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh -. $TEST_DIRECTORY/lib-unique-files.sh +. "$TEST_DIRECTORY"/lib-unique-files.sh test_expect_success 'usage on cmd and subcommand invalid option' ' test_expect_code 129 git stash --invalid-option 2>usage && diff --git a/t/t7609-mergetool--lib.sh b/t/t7609-mergetool--lib.sh index d848fe6442b..330d6d603d7 100755 --- a/t/t7609-mergetool--lib.sh +++ b/t/t7609-mergetool--lib.sh @@ -7,7 +7,7 @@ Testing basic merge tools options' . ./test-lib.sh test_expect_success 'mergetool --tool=vimdiff creates the expected layout' ' - . $GIT_BUILD_DIR/mergetools/vimdiff && + . "$GIT_BUILD_DIR"/mergetools/vimdiff && run_unit_tests ' -- 2.37.0.880.gf07d56b18ba