From: Stephen Morris <stephen@isc.org>
Date: Thu, 15 Feb 2018 15:55:57 +0000 (+0000)
Subject: [rt46602] Change name of shell variable holding current test directory
X-Git-Tag: v9.11.4rc1~113^2~3
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=78f29760878ea80cfdf2ca5892f2c599048a29f0;p=thirdparty%2Fbind9.git

[rt46602] Change name of shell variable holding current test directory

It was TESTNAME, but this is an obvious name and was used in one of
the system tests, something that interfered with the content of
progress messages.  It is now SYSTESTDIR.

(cherry picked from commit 30cd931a0d52744762472bfe7f1582bcf12bd6bf)
---

diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index 33511f3c617..1693210dc70 100644
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@@ -215,11 +215,11 @@ else
 	}
 fi
 
-TESTNAME="`basename $PWD`"
+SYSTESTDIR="`basename $PWD`"
 
 echo_i() {
     echo "$@" | while read LINE ; do
-       echoinfo "I:$TESTNAME:$LINE"
+       echoinfo "I:$SYSTESTDIR:$LINE"
     done
 }