Commit 10b394ac1c027dbd5663bfa1269707d1f8930f3e
2021-11-23T12:52:59
regress: make merge.sh more POSIXy Don't use '==' for equality matching in sh, as this won't work across all shells. ok @naddy
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
diff --git a/regress/cmdline/merge.sh b/regress/cmdline/merge.sh
index 7531c55..e56a0bd 100755
--- a/regress/cmdline/merge.sh
+++ b/regress/cmdline/merge.sh
@@ -56,7 +56,7 @@ test_merge_basic() {
(cd $testroot/wt && got merge newbranch \
> $testroot/stdout 2> $testroot/stderr)
ret="$?"
- if [ "$ret" == "0" ]; then
+ if [ "$ret" = "0" ]; then
echo "got merge succeeded unexpectedly" >&2
test_done "$testroot" "1"
return 1
@@ -86,7 +86,7 @@ test_merge_basic() {
(cd $testroot/wt && got merge newbranch \
> $testroot/stdout 2> $testroot/stderr)
ret="$?"
- if [ "$ret" == "0" ]; then
+ if [ "$ret" = "0" ]; then
echo "got merge succeeded unexpectedly" >&2
test_done "$testroot" "$ret"
return 1
@@ -121,7 +121,7 @@ test_merge_basic() {
(cd $testroot/wt && got merge newbranch \
> $testroot/stdout 2> $testroot/stderr)
ret="$?"
- if [ "$ret" == "0" ]; then
+ if [ "$ret" = "0" ]; then
echo "got merge succeeded unexpectedly" >&2
test_done "$testroot" "$ret"
return 1
@@ -158,7 +158,7 @@ test_merge_basic() {
(cd $testroot/wt && got merge newbranch \
> $testroot/stdout 2> $testroot/stderr)
ret="$?"
- if [ "$ret" == "0" ]; then
+ if [ "$ret" = "0" ]; then
echo "got merge succeeded unexpectedly" >&2
test_done "$testroot" "$ret"
return 1
@@ -183,7 +183,7 @@ test_merge_basic() {
(cd $testroot/wt && got merge newbranch \
> $testroot/stdout 2> $testroot/stderr)
ret="$?"
- if [ "$ret" == "0" ]; then
+ if [ "$ret" = "0" ]; then
echo "got merge succeeded unexpectedly" >&2
test_done "$testroot" "$ret"
return 1
@@ -418,7 +418,7 @@ test_merge_continue() {
(cd $testroot/wt && got merge newbranch \
> $testroot/stdout 2> $testroot/stderr)
ret="$?"
- if [ "$ret" == "0" ]; then
+ if [ "$ret" = "0" ]; then
echo "got merge succeeded unexpectedly" >&2
test_done "$testroot" "1"
return 1
@@ -643,7 +643,7 @@ test_merge_abort() {
(cd $testroot/wt && got merge newbranch \
> $testroot/stdout 2> $testroot/stderr)
ret="$?"
- if [ "$ret" == "0" ]; then
+ if [ "$ret" = "0" ]; then
echo "got merge succeeded unexpectedly" >&2
test_done "$testroot" "1"
return 1
@@ -824,7 +824,7 @@ test_merge_in_progress() {
(cd $testroot/wt && got merge newbranch \
> $testroot/stdout 2> $testroot/stderr)
ret="$?"
- if [ "$ret" == "0" ]; then
+ if [ "$ret" = "0" ]; then
echo "got merge succeeded unexpectedly" >&2
test_done "$testroot" "1"
return 1
@@ -928,7 +928,7 @@ test_merge_path_prefix() {
(cd $testroot/wt && got merge newbranch \
> $testroot/stdout 2> $testroot/stderr)
ret="$?"
- if [ "$ret" == "0" ]; then
+ if [ "$ret" = "0" ]; then
echo "got merge succeeded unexpectedly" >&2
test_done "$testroot" "1"
return 1
@@ -982,7 +982,7 @@ test_merge_missing_file() {
(cd $testroot/wt && got merge newbranch \
> $testroot/stdout 2> $testroot/stderr)
ret="$?"
- if [ "$ret" == "0" ]; then
+ if [ "$ret" = "0" ]; then
echo "got merge succeeded unexpectedly" >&2
test_done "$testroot" "1"
return 1
@@ -1065,7 +1065,7 @@ test_merge_no_op() {
(cd $testroot/wt && got merge newbranch \
> $testroot/stdout 2> $testroot/stderr)
ret="$?"
- if [ "$ret" == "0" ]; then
+ if [ "$ret" = "0" ]; then
echo "got merge succeeded unexpectedly" >&2
test_done "$testroot" "1"
return 1
@@ -1114,7 +1114,7 @@ test_merge_no_op() {
(cd $testroot/wt && got merge -c > $testroot/stdout \
2> $testroot/stderr)
ret="$?"
- if [ "$ret" == "0" ]; then
+ if [ "$ret" = "0" ]; then
echo "got merge succeeded unexpectedly" >&2
test_done "$testroot" "$ret"
return 1