]> git.ipfire.org Git - thirdparty/git.git/commitdiff
test-lib: simplify GIT_SKIP_TESTS loop
authorMichael J Gruber <git@drmicha.warpmail.net>
Mon, 12 Jul 2010 10:32:18 +0000 (12:32 +0200)
committerJunio C Hamano <gitster@pobox.com>
Mon, 12 Jul 2010 14:52:52 +0000 (07:52 -0700)
04ece59 (GIT_SKIP_TESTS: allow users to omit tests that are known to break, 2006-12-28)
introduced GIT_SKIP_TESTS, and since then we have had two nested loops
iterating over GIT_SKIP_TESTS with the same loop variable.

Reduce this to one loop.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/test-lib.sh

index ac496aa479090a4cda1b6e854ed7845484fdfa06..bc0656457baf2d6e2361fb4a347b2fad0bbb3718 100644 (file)
@@ -385,6 +385,7 @@ test_skip () {
                case $this_test.$test_count in
                $skp)
                        to_skip=t
+                       break
                esac
        done
        if test -z "$to_skip" && test -n "$prereq" &&
@@ -829,16 +830,8 @@ this_test=${0##*/}
 this_test=${this_test%%-*}
 for skp in $GIT_SKIP_TESTS
 do
-       to_skip=
-       for skp in $GIT_SKIP_TESTS
-       do
-               case "$this_test" in
-               $skp)
-                       to_skip=t
-               esac
-       done
-       case "$to_skip" in
-       t)
+       case "$this_test" in
+       $skp)
                say_color skip >&3 "skipping test $this_test altogether"
                say_color skip "skip all tests in $this_test"
                test_done