commit 4e2bdb0dade94492580e4fbce20d9717bccc4e61
from: Omar Polo <op@omarpolo.com>
via: Thomas Adam <thomas@xteddy.org>
date: Mon Jun 13 17:55:22 2022 UTC

don't pass $ret to test_done on failure when it's known to be zero

Otherwise the test directory it's not left in place; ok tracey@

commit - 9394843506b5859aab24498152a3adcf21a76b12
commit + 4e2bdb0dade94492580e4fbce20d9717bccc4e61
blob - 3701420c1f2bf7317dd9804af0b9c3ef4ba6ffac
blob + cef3e140e272e2170ff54b98a60b04316659093d
--- regress/cmdline/blame.sh
+++ regress/cmdline/blame.sh
@@ -846,7 +846,7 @@ test_blame_symlink() {
 	ret=$?
 	if [ $ret -eq 0 ]; then
 		echo "blame command succeeded unexpectedly" >&2
-		test_done "$testroot" "$ret"
+		test_done "$testroot" "1"
 		return 1
 	fi
 
@@ -865,7 +865,7 @@ test_blame_symlink() {
 	ret=$?
 	if [ $ret -eq 0 ]; then
 		echo "blame command succeeded unexpectedly" >&2
-		test_done "$testroot" "$ret"
+		test_done "$testroot" "1"
 		return 1
 	fi
 
blob - 8e459f575af5f369a7a0987fa5f5eb2e1680b947
blob + a025c5170abf06b7f707406ee2d9193c3fa6ff43
--- regress/cmdline/branch.sh
+++ regress/cmdline/branch.sh
@@ -286,7 +286,7 @@ test_branch_delete() {
 	ret=$?
 	if [ $ret -eq 0 ]; then
 		echo "got branch succeeded unexpectedly"
-		test_done "$testroot" "$ret"
+		test_done "$testroot" "1"
 		return 1
 	fi
 
@@ -434,7 +434,7 @@ test_branch_delete_packed() {
 	ret=$?
 	if [ $ret -eq 0 ]; then
 		echo "got update succeeded unexpectedly"
-		test_done "$testroot" "$ret"
+		test_done "$testroot" "1"
 		return 1
 	fi
 
blob - 746547aa4a31210a1d3143800e29ff9c4d30902e
blob + 974b1ee37e1bd1153be6a955e7832d37f32e648f
--- regress/cmdline/cherrypick.sh
+++ regress/cmdline/cherrypick.sh
@@ -590,7 +590,7 @@ EOF
 	ret=$?
 	if [ $ret -eq 0 ]; then
 		echo "got commit succeeded unexpectedly" >&2
-		test_done "$testroot" "$ret"
+		test_done "$testroot" "1"
 		return 1
 	fi
 	echo -n "got: $testroot/wt/dotgotfoo.link: symbolic link points " \
blob - 59f3d74f6c80fbf6c7182efae1d36295d9a4134f
blob + 8c528ea1f5a368de063e916a5668b66b65392105
--- regress/cmdline/integrate.sh
+++ regress/cmdline/integrate.sh
@@ -372,7 +372,7 @@ test_integrate_backwards_in_time() {
 	ret=$?
 	if [ $ret -eq 0 ]; then
 		echo "got integrate succeeded unexpectedly"
-		test_done "$testroot" "$ret"
+		test_done "$testroot" "1"
 		return 1
 	fi
 
blob - 155c33f0173f68f8c1375feaf38ffc73113b0b7e
blob + c1e703a5e36a9140b460df532dc84b36583e5884
--- regress/cmdline/patch.sh
+++ regress/cmdline/patch.sh
@@ -793,7 +793,7 @@ EOF
 	ret=$?
 	if [ $ret -eq 0 ]; then
 		echo "edited a missing file" >&2
-		test_done $testroot $ret
+		test_done $testroot 1
 		return 1
 	fi
 
blob - 85881196beb482de5fdcb7e3c4ec5112a287758c
blob + 563ef75073b34c24187086af0ec4227156583358
--- regress/cmdline/ref.sh
+++ regress/cmdline/ref.sh
@@ -237,7 +237,7 @@ test_ref_delete() {
 	ret=$?
 	if [ $ret -eq 0 ]; then
 		echo "got ref succeeded unexpectedly"
-		test_done "$testroot" "$ret"
+		test_done "$testroot" "1"
 		return 1
 	fi
 
blob - 1b07381441f738fff178f9bd80e3043f168dc0cb
blob + 5b7231fd5e9a81e444ef0abfde043e2d565cc61b
--- regress/cmdline/send.sh
+++ regress/cmdline/send.sh
@@ -173,7 +173,7 @@ EOF
 	ret=$?
 	if [ $ret -eq 0 ]; then
 		echo "got send command succeeded unexpectedly" >&2
-		test_done "$testroot" "$ret"
+		test_done "$testroot" 1
 		return 1
 	fi
 	
@@ -235,7 +235,7 @@ EOF
 	ret=$?
 	if [ $ret -eq 0 ]; then
 		echo "got send command succeeded unexpectedly" >&2
-		test_done "$testroot" "$ret"
+		test_done "$testroot" 1
 		return 1
 	fi
 	echo "got: origin: remote repository not found" \
@@ -361,7 +361,7 @@ EOF
 	ret=$?
 	if [ $ret -eq 0 ]; then
 		echo "got send command succeeded unexpectedly" >&2
-		test_done "$testroot" "$ret"
+		test_done "$testroot" 1
 		return 1
 	fi
 	echo -n "got: changes on refs/heads/branch1 will be sent to server" \
@@ -411,7 +411,7 @@ EOF
 	ret=$?
 	if [ $ret -eq 0 ]; then
 		echo "got send command succeeded unexpectedly" >&2
-		test_done "$testroot" "$ret"
+		test_done "$testroot" 1
 		return 1
 	fi
 	echo -n "got-send-pack: refs/heads/branchX does not exist in remote " \
@@ -432,7 +432,7 @@ EOF
 	ret=$?
 	if [ $ret -eq 0 ]; then
 		echo "got send command succeeded unexpectedly" >&2
-		test_done "$testroot" "$ret"
+		test_done "$testroot" 1
 		return 1
 	fi
 	echo -n "got-send-pack: refs/heads/refs/tags/1.0 does not exist " \
@@ -716,7 +716,7 @@ EOF
 	ret=$?
 	if [ $ret -eq 0 ]; then
 		echo "got send command succeeded unexpectedly" >&2
-		test_done "$testroot" "$ret"
+		test_done "$testroot" 1
 		return 1
 	fi
 
@@ -736,7 +736,7 @@ EOF
 	ret=$?
 	if [ $ret -eq 0 ]; then
 		echo "got send command succeeded unexpectedly" >&2
-		test_done "$testroot" "$ret"
+		test_done "$testroot" 1
 		return 1
 	fi
 
@@ -1093,7 +1093,7 @@ test_send_all_branches() {
 	ret=$?
 	if [ $ret -eq 0 ]; then
 		echo "got send command succeeded unexpectedly" >&2
-		test_done "$testroot" "$ret"
+		test_done "$testroot" 1
 		return 1
 	fi
 	echo "got: -a and -b options are mutually exclusive" \
blob - b09a4d66b5640e78d01e5ba643dde5b92c9f4e9e
blob + 6d7a319d9ee299c535652176799ee290326537fa
--- regress/cmdline/stage.sh
+++ regress/cmdline/stage.sh
@@ -2387,7 +2387,7 @@ test_stage_symlink() {
 	ret=$?
 	if [ $ret -eq 0 ]; then
 		echo "got stage succeeded unexpectedly" >&2
-		test_done "$testroot" "$ret"
+		test_done "$testroot" 1
 		return 1
 	fi
 	echo -n "got: $testroot/wt/dotgotbar.link: " > $testroot/stderr.expected