git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v6 2/3] vimdiff: integrate layout tests in the unit tests framework ('t' folder)

From
Fernando Ramos <greenfoo@u92.eu>
Date
Mar 27, 2022, 11:23 UTC
Message-ID
<20220327112307.151044-3-greenfoo@u92.eu>
In-Reply-To
<20220327112307.151044-1-greenfoo@u92.eu>

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 <greenfoo@u92.eu>
---
 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
Previous: Junio C HamanoNext: Junio C Hamano
Message 6 of 16 in “vimdiff: new implementation with layout support”
  1. 0/3 vimdiff: new implementation with layout supportFernando Ramos, Mar 27, 2022
  2. 1/3 vimdiff: new implementation with layout supportFernando Ramos, Mar 27, 2022
  3. Philippe BlainMar 27, 2022
  4. Fernando RamosMar 27, 2022
  5. Junio C HamanoMar 27, 2022
  6. 2/3 vimdiff: integrate layout tests in the unit tests framework ('t' folder)Fernando Ramos, Mar 27, 2022
  7. Junio C HamanoMar 27, 2022
  8. 3/3 vimdiff: add tool documentationFernando Ramos, Mar 27, 2022
  9. Philippe BlainMar 27, 2022
  10. fixup! vimdiff: add tool documentationPhilippe Blain, Mar 27, 2022
  11. Fernando RamosMar 27, 2022
  12. Junio C HamanoMar 27, 2022
  13. Fernando RamosMar 27, 2022
  14. Bagas SanjayaMar 28, 2022
  15. Junio C HamanoMar 28, 2022
  16. Fernando RamosMar 28, 2022

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.