test: rename $satisfied to $satisfied_prereq
authorJunio C Hamano <gitster@pobox.com>
Thu, 26 Jul 2012 20:57:56 +0000 (13:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 27 Jul 2012 16:44:09 +0000 (09:44 -0700)
All other shell variables that are used to globally keep track of
states related to prerequisite have "prereq" somewhere in their
names.  Be consistent and avoid potential name crashes with other
kinds of satisfaction in the future.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/test-lib-functions.sh

index 80daaca7806cbe1a6de0ddeba40400c8a811328e..4dc027d406d4bef7f51e51b0780361fdb6efff74 100644 (file)
@@ -221,9 +221,9 @@ write_script () {
 # capital letters by convention).
 
 test_set_prereq () {
-       satisfied="$satisfied$1 "
+       satisfied_prereq="$satisfied_prereq$1 "
 }
-satisfied=" "
+satisfied_prereq=" "
 
 test_have_prereq () {
        # prerequisites can be concatenated with ','
@@ -239,7 +239,7 @@ test_have_prereq () {
        for prerequisite
        do
                total_prereq=$(($total_prereq + 1))
-               case $satisfied in
+               case "$satisfied_prereq" in
                *" $prerequisite "*)
                        ok_prereq=$(($ok_prereq + 1))
                        ;;