t3407-rebase-abort.sh: Enhance existing tests, and add test for rebase --merge

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 9d9cb8d5a1de359e6431dd58b002b065d5651268..87a5ea4a6a54d712c0973cd9b8090c3ec83fb828 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -275,6 +275,23 @@ test_expect_code () {
        echo >&3 ""
 }
 
+# This is not among top-level (test_expect_success | test_expect_failure)
+# but is a prefix that can be used in the test script, like:
+#
+#      test_expect_success 'complain and die' '
+#           do something &&
+#           do something else &&
+#          test_must_fail git checkout ../outerspace
+#      '
+#
+# Writing this as "! git checkout ../outerspace" is wrong, because
+# the failure could be due to a segv.  We want a controlled failure.
+
+test_must_fail () {
+       "$@"
+       test $? -gt 0 -a $? -le 128
+}
+
 # Most tests can use the created repository, but some may need to create more.
 # Usage: test_create_repo <directory>
 test_create_repo () {
@@ -347,6 +364,8 @@ if ! test -x ../test-chmtime; then
        exit 1
 fi
 
+. ../GIT-BUILD-OPTIONS
+
 # Test repository
 test=trash
 rm -fr "$test"