t8001/t8002: blame: decompose overly-large test

diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index b6a747829a63ec8ec18a7ea635011a70b3178f52..ffc5697f46ab5593a1f36d2e883113a42c4d4576 100644 (file)
--- a/t/annotate-tests.sh
+++ b/t/annotate-tests.sh
@@ -3,17 +3,19 @@
 
 check_count () {
        head= &&
+       file='file' &&
        options= &&
        while :
        do
                case "$1" in
                -h) head="$2"; shift; shift ;;
+               -f) file="$2"; shift; shift ;;
                -*) options="$options $1"; shift ;;
                *) break ;;
                esac
        done &&
-       echo "$PROG $options file $head" >&4 &&
-       $PROG $options file $head >actual &&
+       echo "$PROG $options $file $head" >&4 &&
+       $PROG $options $file $head >actual &&
        perl -e '
                my %expect = (@ARGV);
                my %count = map { $_ => 0 } keys %expect;
@@ -231,12 +233,72 @@ test_expect_success 'blame -L ,Y (Y > nlines)' '
        test_must_fail $PROG -L,12345 file
 '
 
-test_expect_success 'blame -L bogus' '
-       test_must_fail $PROG -L file &&
-       test_must_fail $PROG -L1,+ file &&
-       test_must_fail $PROG -L1,- file &&
-       test_must_fail $PROG -LX file &&
-       test_must_fail $PROG -L1,X file &&
-       test_must_fail $PROG -L1,+N file &&
+test_expect_success 'setup -L :regex' '
+       tr Q "\\t" >hello.c <<-\EOF &&
+       int main(int argc, const char *argv[])
+       {
+       Qputs("hello");
+       }
+       EOF
+       git add hello.c &&
+       GIT_AUTHOR_NAME="F" GIT_AUTHOR_EMAIL="F@test.git" \
+       git commit -m "hello" &&
+
+       mv hello.c hello.orig &&
+       sed -e "/}/ {x; s/$/Qputs(\"goodbye\");/; G;}" <hello.orig |
+       tr Q "\\t" >hello.c &&
+       GIT_AUTHOR_NAME="G" GIT_AUTHOR_EMAIL="G@test.git" \
+       git commit -a -m "goodbye" &&
+
+       mv hello.c hello.orig &&
+       echo "#include <stdio.h>" >hello.c &&
+       cat hello.orig >>hello.c &&
+       tr Q "\\t" >>hello.c <<-\EOF
+       void mail()
+       {
+       Qputs("mail");
+       }
+       EOF
+       GIT_AUTHOR_NAME="H" GIT_AUTHOR_EMAIL="H@test.git" \
+       git commit -a -m "mail"
+'
+
+test_expect_success 'blame -L :literal' '
+       check_count -f hello.c -L:main F 4 G 1
+'
+
+test_expect_success 'blame -L :regex' '
+       check_count -f hello.c "-L:m[a-z][a-z]l" H 4
+'
+
+test_expect_success 'blame -L :nomatch' '
+       test_must_fail $PROG -L:nomatch hello.c
+'
+
+test_expect_success 'blame -L' '
+       test_must_fail $PROG -L file
+'
+
+test_expect_success 'blame -L X,+' '
+       test_must_fail $PROG -L1,+ file
+'
+
+test_expect_success 'blame -L X,-' '
+       test_must_fail $PROG -L1,- file
+'
+
+test_expect_success 'blame -L X (non-numeric X)' '
+       test_must_fail $PROG -LX file
+'
+
+test_expect_success 'blame -L X,Y (non-numeric Y)' '
+       test_must_fail $PROG -L1,Y file
+'
+
+test_expect_success 'blame -L X,+N (non-numeric N)' '
+       test_must_fail $PROG -L1,+N file
+'
+
+test_expect_success 'blame -L X,-N (non-numeric N)' '
        test_must_fail $PROG -L1,-N file
 '