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

Re: [PATCH 04/11] t4032: make test "set -e" clean

From
Patrick Steinhardt <ps@pks.im>
Date
Mar 25, 2026, 07:15 UTC
Message-ID
<acOLmU891XXsTcre@pks.im>
In-Reply-To
<20260325062114.2067946-5-gitster@pobox.com>
On Tue, Mar 24, 2026 at 11:21:07PM -0700, Junio C Hamano wrote:
Show 13 quoted lines
> diff --git a/t/t4032-diff-inter-hunk-context.sh b/t/t4032-diff-inter-hunk-context.sh
> index bada0cbd32..efcd863126 100755
> --- a/t/t4032-diff-inter-hunk-context.sh
> +++ b/t/t4032-diff-inter-hunk-context.sh
> @@ -40,7 +40,7 @@ t() {
>  		test $(git $cmd $file | grep '^@@ ' | wc -l) = $hunks
>  	"
>  
> -	test -f $expected &&
> +	test ! -f $expected ||
>  	test_expect_success "$label: check output" "
>  		git $cmd $file | grep -v '^index ' >actual &&
>  		test_cmp $expected actual
I fixed this by applying this change:
@@ -40,11 +40,13 @@ t() {
                test $(git $cmd $file | grep '^@@ ' | wc -l) = $hunks
        "

-       test -f $expected &&
-       test_expect_success "$label: check output" "
-               git $cmd $file | grep -v '^index ' >actual &&
-               test_cmp $expected actual
-       "
+       if test -f $expected
+       then
+               test_expect_success "$label: check output" "
+                       git $cmd $file | grep -v '^index ' >actual &&
+                       test_cmp $expected actual
+               "
+       fi
 }

More churn, but the intent is easier to reason about, if you ask me.

Patrick
Previous: Junio C HamanoNext: Junio C Hamano
Message 14 of 28 in “detect misspelt test_expect_success and friends”
  1. 00/11 detect misspelt test_expect_success and friendsJunio C Hamano, Mar 25, 2026
  2. 01/11 test-lib: catch misspelt 'test_expect_successo'Junio C Hamano, Mar 25, 2026
  3. Jeff KingMar 26, 2026
  4. Junio C HamanoMar 26, 2026
  5. Jeff KingMar 26, 2026
  6. Patrick SteinhardtMar 27, 2026
  7. Junio C HamanoMar 27, 2026
  8. Patrick SteinhardtMar 31, 2026
  9. 02/11 t0008: make test "set -e" cleanJunio C Hamano, Mar 25, 2026
  10. 03/11 t6002: make test "set -e" cleanJunio C Hamano, Mar 25, 2026
  11. Patrick SteinhardtMar 25, 2026
  12. Junio C HamanoMar 25, 2026
  13. 04/11 t4032: make test "set -e" cleanJunio C Hamano, Mar 25, 2026
  14. Patrick SteinhardtMar 25, 2026
  15. 05/11 t7450: make test "set -e" cleanJunio C Hamano, Mar 25, 2026
  16. Patrick SteinhardtMar 25, 2026
  17. 06/11 tests: make svn test "set -e" cleanJunio C Hamano, Mar 25, 2026
  18. Patrick SteinhardtMar 25, 2026
  19. 07/11 t7508: make test "set -e" cleanJunio C Hamano, Mar 25, 2026
  20. 08/11 t9200: make test "set -e" cleanJunio C Hamano, Mar 25, 2026
  21. Patrick SteinhardtMar 25, 2026
  22. 09/11 t940?: make test "set -e" cleanJunio C Hamano, Mar 25, 2026
  23. 10/11 t5570: make test "set -e" cleanJunio C Hamano, Mar 25, 2026
  24. Patrick SteinhardtMar 25, 2026
  25. Junio C HamanoMar 25, 2026
  26. 11/11 t9902: make test "set -e" cleanJunio C Hamano, Mar 25, 2026
  27. Patrick SteinhardtMar 25, 2026
  28. Junio C HamanoMar 25, 2026

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.