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

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

From
Fernando Ramos <greenfoo@u92.eu>
Date
Mar 29, 2022, 22:44 UTC
Message-ID
<20220329224439.290948-3-greenfoo@u92.eu>
In-Reply-To
<20220329224439.290948-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 | 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.35.1
Previous: Fernando RamosNext: Fernando Ramos
Message 22 of 37 in “vimdiff: new implementation with layout support”
  1. 0/4 vimdiff: new implementation with layout supportFernando Ramos, Mar 28, 2022
  2. 1/4 vimdiff: new implementation with layout supportFernando Ramos, Mar 28, 2022
  3. 2/4 vimdiff: integrate layout tests in the unit tests framework ('t' folder)Fernando Ramos, Mar 28, 2022
  4. 4/4 vimdiff: add description to already existing diff/merge toolsFernando Ramos, Mar 28, 2022
  5. Junio C HamanoMar 29, 2022
  6. Philippe BlainMar 29, 2022
  7. Junio C HamanoMar 29, 2022
  8. Fernando RamosMar 29, 2022
  9. 3/4 vimdiff: add tool documentationFernando Ramos, Mar 28, 2022
  10. Fernando RamosMar 28, 2022
  11. Junio C HamanoMar 29, 2022
  12. fixup! vimdiff: add tool documentationPhilippe Blain, Mar 29, 2022
  13. Junio C HamanoMar 29, 2022
  14. Philippe BlainMar 29, 2022
  15. Junio C HamanoMar 29, 2022
  16. Philippe BlainMar 29, 2022
  17. Philippe BlainMar 29, 2022
  18. Philippe BlainMar 29, 2022
  19. Fernando RamosMar 29, 2022
  20. 0/5 vimdiff: new implementation with layout supportFernando Ramos, Mar 29, 2022
  21. 1/5 vimdiff: new implementation with layout supportFernando Ramos, Mar 29, 2022
  22. 2/5 vimdiff: integrate layout tests in the unit tests framework ('t' folder)Fernando Ramos, Mar 29, 2022
  23. 3/5 vimdiff: add tool documentationFernando Ramos, Mar 29, 2022
  24. 4/5 mergetools: add description to all diff/merge toolsFernando Ramos, Mar 29, 2022
  25. 5/5 mergetools: add tools description to `git help config`Fernando Ramos, Mar 29, 2022
  26. Philippe BlainMar 30, 2022
  27. Fernando RamosMar 30, 2022
  28. Philippe BlainMar 30, 2022
  29. 0/4 vimdiff: new implementation with layout supportFernando Ramos, Mar 30, 2022
  30. 1/4 vimdiff: new implementation with layout supportFernando Ramos, Mar 30, 2022
  31. 2/4 vimdiff: integrate layout tests in the unit tests framework ('t' folder)Fernando Ramos, Mar 30, 2022
  32. 3/4 vimdiff: add tool documentationFernando Ramos, Mar 30, 2022
  33. Philippe BlainApr 3, 2022
  34. Junio C HamanoApr 3, 2022
  35. Fernando RamosApr 4, 2022
  36. Junio C HamanoApr 4, 2022
  37. 4/4 mergetools: add description to all diff/merge toolsFernando Ramos, Mar 30, 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.