summaryrefslogtreecommitdiff
path: root/t/test-lib-functions.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-07-26 20:57:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-07-27 16:44:09 (GMT)
commitf3cfc3b27168a085d4ca7ab5801814c4f419b54d (patch)
treef9cb9a78836265a5ec9251cc99254a9c44b0eb2a /t/test-lib-functions.sh
parentcdd159b2f56c9e69e37bbb8f5af301abd93e5407 (diff)
downloadgit-f3cfc3b27168a085d4ca7ab5801814c4f419b54d.zip
git-f3cfc3b27168a085d4ca7ab5801814c4f419b54d.tar.gz
git-f3cfc3b27168a085d4ca7ab5801814c4f419b54d.tar.bz2
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 <gitster@pobox.com>
Diffstat (limited to 't/test-lib-functions.sh')
-rw-r--r--t/test-lib-functions.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index 80daaca..4dc027d 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))
;;