t3419: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite

This was only necessary because do_tests helper the script defines
took its parameters in a wrong order.  Just pass an empty string (or
not passing the optional EXPENSIVE prerequisite) when running the
test with a light-weight set of parameters and have the shell do the
right thing when parsing test_expect_success helper.

Also update coding style while we are at it.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t3419-rebase-patch-id.sh b/t/t3419-rebase-patch-id.sh
index 08e30b30f40e767c19f3b074a19840f07944d063..9292b499f39925b6832bccd826fb43a8818f155a 100755 (executable)
--- a/t/t3419-rebase-patch-id.sh
+++ b/t/t3419-rebase-patch-id.sh
@@ -4,11 +4,9 @@ test_description='git rebase - test patch id computation'
 
 . ./test-lib.sh
 
 
 . ./test-lib.sh
 

-test_set_prereq NOT_EXPENSIVE

 test -n "$GIT_PATCHID_TIMING_TESTS" && test_set_prereq EXPENSIVE
 
 test -n "$GIT_PATCHID_TIMING_TESTS" && test_set_prereq EXPENSIVE
 

-count()
-{
+count () {

        i=0
        while test $i -lt $1
        do
        i=0
        while test $i -lt $1
        do


@@ -17,8 +15,7 @@ count()
        done
 }
 
        done
 }
 

-scramble()
-{
+scramble () {

        i=0
        while read x
        do
        i=0
        while read x
        do


@@ -27,12 +24,11 @@ scramble()
                        echo "$x"
                fi
                i=$((($i+1) % 10))
                        echo "$x"
                fi
                i=$((($i+1) % 10))

-       done < "$1" > "$1.new"
+       done <"$1" >"$1.new"

        mv -f "$1.new" "$1"
 }
 
        mv -f "$1.new" "$1"
 }
 

-run()
-{
+run () {

        echo \$ "$@"
        /usr/bin/time "$@" >/dev/null
 }
        echo \$ "$@"
        /usr/bin/time "$@" >/dev/null
 }


@@ -42,10 +38,8 @@ test_expect_success 'setup' '
        git tag root
 '
 
        git tag root
 '
 

-do_tests()
-{
-       pr=$1
-       nlines=$2
+do_tests () {
+       nlines=$1 pr=${2-}

 
        test_expect_success $pr "setup: $nlines lines" "
                rm -f .gitattributes &&
 
        test_expect_success $pr "setup: $nlines lines" "
                rm -f .gitattributes &&


@@ -102,7 +96,7 @@ do_tests()
        "
 }
 
        "
 }
 

-do_tests NOT_EXPENSIVE 500
-do_tests EXPENSIVE 50000
+do_tests 500
+do_tests 50000 EXPENSIVE

 
 test_done
 
 test_done