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

[PATCH 06/11] tests: make svn test "set -e" clean

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 25, 2026, 06:21 UTC
Message-ID
<20260325062114.2067946-7-gitster@pobox.com>
In-Reply-To
<20260325062114.2067946-1-gitster@pobox.com>

In order to catch mistakes like misspelling "test_expect_success", we would like to eventually be able to run our test suite with the "-e" option on.

The git-svn helper scriptlet suffers from two instances of the recurring pattern where a sequence

	cmd ...
	if test $? ...

expects cmd to be allowed to fail freely and we can act on its exit status, which is not possible under "set -e".

As the second instance uses an extra variable $x to capture the status of the failed command already, let's use that variable to rewrite the above pattern to

	x=0; cmd ... || x=$?
	if test $x ...
which means the same thing but does not fail under "set -e".
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 t/lib-git-svn.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh
index 2fde2353fd..a73b997f8f 100644
--- a/t/lib-git-svn.sh
+++ b/t/lib-git-svn.sh
@@ -15,8 +15,8 @@ GIT_SVN_DIR=$GIT_DIR/svn/refs/remotes/git-svn
 SVN_TREE=$GIT_SVN_DIR/svn-tree
 test_set_port SVNSERVE_PORT
 
-svn >/dev/null 2>&1
-if test $? -ne 1
+x=0; svn >/dev/null 2>&1 || x=$?
+if test $x -ne 1
 then
 	skip_all='skipping git svn tests, svn not found'
 	test_done
@@ -32,8 +32,7 @@ use SVN::Core;
 use SVN::Repos;
 \$SVN::Core::VERSION gt '1.1.0' or exit(42);
 system(qw/svnadmin create --fs-type fsfs/, \$ENV{svnrepo}) == 0 or exit(41);
-" >&3 2>&4
-x=$?
+" >&3 2>&4 || x=$?
 if test $x -ne 0
 then
 	if test $x -eq 42; then
-- 
2.53.0-886-g529cbd14ff
Previous: Patrick SteinhardtNext: Patrick Steinhardt
Message 17 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.