Merge branch 'gc/branch-recurse-submodules-fix'

[thirdparty/git.git] / t / t6030-bisect-porcelain.sh

diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index 1be85d064e7612526a66f0f642a424ed1da12f89..5382e5d21620aea6bd74fdd4a84fb14f0ac644dc 100755 (executable)
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -278,6 +278,51 @@ test_expect_success '"git bisect run" with more complex "git bisect start"' '
        git bisect reset
 '
 
+test_expect_success 'bisect run accepts exit code 126 as bad' '
+       test_when_finished "git bisect reset" &&
+       write_script test_script.sh <<-\EOF &&
+       ! grep Another hello || exit 126 >/dev/null
+       EOF
+       git bisect start &&
+       git bisect good $HASH1 &&
+       git bisect bad $HASH4 &&
+       git bisect run ./test_script.sh >my_bisect_log.txt &&
+       grep "$HASH3 is the first bad commit" my_bisect_log.txt
+'
+
+test_expect_success POSIXPERM 'bisect run fails with non-executable test script' '
+       test_when_finished "git bisect reset" &&
+       >not-executable.sh &&
+       chmod -x not-executable.sh &&
+       git bisect start &&
+       git bisect good $HASH1 &&
+       git bisect bad $HASH4 &&
+       test_must_fail git bisect run ./not-executable.sh >my_bisect_log.txt &&
+       ! grep "is the first bad commit" my_bisect_log.txt
+'
+
+test_expect_success 'bisect run accepts exit code 127 as bad' '
+       test_when_finished "git bisect reset" &&
+       write_script test_script.sh <<-\EOF &&
+       ! grep Another hello || exit 127 >/dev/null
+       EOF
+       git bisect start &&
+       git bisect good $HASH1 &&
+       git bisect bad $HASH4 &&
+       git bisect run ./test_script.sh >my_bisect_log.txt &&
+       grep "$HASH3 is the first bad commit" my_bisect_log.txt
+'
+
+test_expect_success 'bisect run fails with missing test script' '
+       test_when_finished "git bisect reset" &&
+       rm -f does-not-exist.sh &&
+       git bisect start &&
+       git bisect good $HASH1 &&
+       git bisect bad $HASH4 &&
+       test_must_fail git bisect run ./does-not-exist.sh >my_bisect_log.txt &&
+       ! grep "is the first bad commit" my_bisect_log.txt
+'
+
 # $HASH1 is good, $HASH5 is bad, we skip $HASH3
 # but $HASH4 is good,
 # so we should find $HASH5 as the first bad commit