From f3cfc3b27168a085d4ca7ab5801814c4f419b54d Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 26 Jul 2012 13:57:56 -0700 Subject: [PATCH] test: rename $satisfied to $satisfied_prereq 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 --- t/test-lib-functions.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index 80daaca7806..4dc027d406d 100644 --- a/t/test-lib-functions.sh +++ b/t/test-lib-functions.sh @@ -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)) ;;