Commit a19f439c4e07de5c812f1771b37cecbba6e631c4
2022-06-03T20:26:48
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@
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185
diff --git a/regress/cmdline/blame.sh b/regress/cmdline/blame.sh
index e88c01a..ce55e3f 100755
--- a/regress/cmdline/blame.sh
+++ b/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
diff --git a/regress/cmdline/branch.sh b/regress/cmdline/branch.sh
index 8e459f5..a025c51 100755
--- a/regress/cmdline/branch.sh
+++ b/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
diff --git a/regress/cmdline/cherrypick.sh b/regress/cmdline/cherrypick.sh
index 15c8d5d..435304c 100755
--- a/regress/cmdline/cherrypick.sh
+++ b/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 " \
diff --git a/regress/cmdline/integrate.sh b/regress/cmdline/integrate.sh
index 59f3d74..8c528ea 100755
--- a/regress/cmdline/integrate.sh
+++ b/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
diff --git a/regress/cmdline/patch.sh b/regress/cmdline/patch.sh
index 155c33f..c1e703a 100755
--- a/regress/cmdline/patch.sh
+++ b/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
diff --git a/regress/cmdline/ref.sh b/regress/cmdline/ref.sh
index 8588119..563ef75 100755
--- a/regress/cmdline/ref.sh
+++ b/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
diff --git a/regress/cmdline/send.sh b/regress/cmdline/send.sh
index 1b07381..5b7231f 100755
--- a/regress/cmdline/send.sh
+++ b/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" \
diff --git a/regress/cmdline/stage.sh b/regress/cmdline/stage.sh
index e16d985..701e5bd 100755
--- a/regress/cmdline/stage.sh
+++ b/regress/cmdline/stage.sh
@@ -2390,7 +2390,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