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.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 831101F8C4 for ; Sun, 27 Mar 2022 11:23:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233613AbiC0LZD (ORCPT ); Sun, 27 Mar 2022 07:25:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33444 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233268AbiC0LY7 (ORCPT ); Sun, 27 Mar 2022 07:24:59 -0400 Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 96C665F4F for ; Sun, 27 Mar 2022 04:23:18 -0700 (PDT) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id F25FD5C00E3; Sun, 27 Mar 2022 07:23:17 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Sun, 27 Mar 2022 07:23:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=u92.eu; h=cc:cc :content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm2; bh=NiCsvDdZ4JUHay3PaZ68UWP117gbx3 SwmlpZSLcEUGk=; b=J6y7bdDWDlPt4XPsPD9mlNxcPvR+VacIm8XBmEvrSNjN63 na/SwWmg7HufvSg70U++ttgua2SdojqCIFvb1D7gopp8GFV3aEc7xrgjJecIG743 NdJ80f3KApUS0rojnaRY01Leng4wvRvO+HjUt3apHR4XASHcdkzAwnyLy1NsJz2i NBysO4xGb5zeCrTykQXFj5CKRXtVc15cCwXq8+bEdvNsrxjTWsO5pRNwqmXObNkg VMQAudxewu+FX/8ekzvjCU65x4ZqnlF1jPCYY2BCClDPAdHuTk6SdJLRDRIihO08 tCTbR9rN+u1C+yoZZNvxCASDlaRkG/pmPj4DCn0A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=NiCsvD dZ4JUHay3PaZ68UWP117gbx3SwmlpZSLcEUGk=; b=Z32SnIrE6iy4rugvUtlGbx y6G8HwDsXNCcIHW0HBebPgxuqRLhJWwnH60qZKV32Mt6/3FBGGTySPg1gREqmv8w tXzeZB9MVAghQI03TNxjvqwdSpEFyAwQvIUiC6nmDJBA/HmDSjkxvk3Geolk7Eob eGsoTJmtckMUJUald+wjGXk3tg4KmtEoolvD7LIWOhskXlOq4O32nMBKzvr1UYij g63UuFyZHykffVY03d7iRq/g92Grs+UzVvk9DVnyF/SswipFq3AG8DqadYe9gkDi OYWOajHay8xdJu+r9ZcP7REI4ZkiR4pA0kYLf43FgoSDiij3OHG+zbvpU0Ox8jKg == X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrudehhedggedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomhephfgvrhhnrghnughoucftrghmohhsuceoghhrvggvnhhfohho sehuledvrdgvuheqnecuggftrfgrthhtvghrnhepkeelkeejtdehjeehkeefgfegvedvgf eugeffueevudfhheeugeekieejvddvjeefnecuvehluhhsthgvrhfuihiivgeptdenucfr rghrrghmpehmrghilhhfrhhomhepghhrvggvnhhfohhosehuledvrdgvuh X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 27 Mar 2022 07:23:15 -0400 (EDT) From: Fernando Ramos To: git@vger.kernel.org Cc: gitster@pobox.com, davvid@gmail.com, sunshine@sunshineco.com, seth@eseth.com, levraiphilippeblain@gmail.com, rogi@skylittlesystem.org Subject: [PATCH v6 2/3] vimdiff: integrate layout tests in the unit tests framework ('t' folder) Date: Sun, 27 Mar 2022 13:23:06 +0200 Message-Id: <20220327112307.151044-3-greenfoo@u92.eu> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220327112307.151044-1-greenfoo@u92.eu> References: <20220327112307.151044-1-greenfoo@u92.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Create a new test case file for the different available merge tools. Right now it only tests the 'mergetool.vimdiff.layout' option. Other merge tools might be interested in adding their own tests here too. Signed-off-by: Fernando Ramos --- t/t7609-mergetool--lib.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100755 t/t7609-mergetool--lib.sh diff --git a/t/t7609-mergetool--lib.sh b/t/t7609-mergetool--lib.sh new file mode 100755 index 0000000000..8cfc22e27c --- /dev/null +++ b/t/t7609-mergetool--lib.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +test_description='git mergetool + +Testing basic merge tools options' + +. ./test-lib.sh + +test_expect_success 'mergetool --tool=vimdiff creates the expected layout' ' + . $GIT_BUILD_DIR/mergetools/vimdiff && + run_unit_tests +' + +test_done + -- 2.35.1