From: Omar Polo Subject: fix some test_done when $ret is 0 To: gameoftrees@openbsd.org Date: Fri, 03 Jun 2022 16:50:24 +0200 some test_done calls are done when we know that $ret is zero, this means that the test directories are removed. (looked into it after a report by tracey@ on irc) found with a very crude $ grep -n -A5 -- '-eq 0' *.sh | grep test_done | grep -v 1 diff 1157727071f695424bab93ea0cf54d75e5678658 /home/op/w/got blob - e88c01aa511a2049c9fece87f2e78bb8e9f274b7 file + regress/cmdline/blame.sh --- 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 file + regress/cmdline/branch.sh --- 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 - 15c8d5decf9f20816bd1d23ebed6d2d56437e4f1 file + regress/cmdline/cherrypick.sh --- 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 file + regress/cmdline/integrate.sh --- 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 file + regress/cmdline/patch.sh --- 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 file + regress/cmdline/ref.sh --- 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 file + regress/cmdline/send.sh --- 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 - 4d3296ab5a4f2fe50d189515c7a46727daed5436 file + regress/cmdline/stage.sh --- regress/cmdline/stage.sh +++ regress/cmdline/stage.sh @@ -2443,7 +2443,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