From a242c150ebb02d4146694d982f806620ca0e565b Mon Sep 17 00:00:00 2001 From: Fernando Ramos Date: Wed, 30 Mar 2022 21:19:07 +0200 Subject: [PATCH] vimdiff: integrate layout tests in the unit tests framework ('t' folder) 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 Signed-off-by: Junio C Hamano --- t/t7609-mergetool--lib.sh | 14 ++++++++++++++ 1 file changed, 14 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..d848fe6442 --- /dev/null +++ b/t/t7609-mergetool--lib.sh @@ -0,0 +1,14 @@ +#!/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.11.4.GIT