use $testsdir in a few more places

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2760 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/regression-tests/cleandig b/regression-tests/cleandig
index c9a14ea26d403dfcf1cd10c4ffaf18525f1b1338..915f3dc971a5722145f830959d99af6ee77aed9a 100755 (executable)
--- a/regression-tests/cleandig
+++ b/regression-tests/cleandig
@@ -1,22 +1,22 @@
 #!/bin/sh
-if [ ! -f $testname/use.drill ]
+if [ ! -f ${testsdir}/${testname}/use.drill ]
 then
 ../pdns/sdig $nameserver $port $1 $2 $3 | LC_ALL=C sort
 fi
-../pdns/nsec3dig $nameserver $port $1 $2 > $testname/nsec3dig.out 2>&1
-drill -a -p $port -o rd -D -S -k trustedkeys $1 $2 @$nameserver > $testname/drillchase.out 2>&1 
-echo RETVAL: $? >> $testname/drillchase.out
-drill -a -p $port -o rd -D -k trustedkeys $1 $2 @$nameserver > $testname/drill.out 2>&1
-echo RETVAL: $? >> $testname/drill.out
-/usr/lib/go/bin/q -tcp=true -short=true -rd=false -check -dnssec -port=$port @$nameserver $2 $1 > $testname/q.out 2>&1
-echo RETVAL: $? >> $testname/q.out
-if [ ! -e $testname/skip-unboundhost ]
+../pdns/nsec3dig $nameserver $port $1 $2 > ${testsdir}/${testname}/nsec3dig.out 2>&1
+drill -a -p $port -o rd -D -S -k trustedkeys $1 $2 @$nameserver > ${testsdir}/${testname}/drillchase.out 2>&1 
+echo RETVAL: $? >> ${testsdir}/${testname}/drillchase.out
+drill -a -p $port -o rd -D -k trustedkeys $1 $2 @$nameserver > ${testsdir}/${testname}/drill.out 2>&1
+echo RETVAL: $? >> ${testsdir}/${testname}/drill.out
+/usr/lib/go/bin/q -tcp=true -short=true -rd=false -check -dnssec -port=$port @$nameserver $2 $1 > ${testsdir}/${testname}/q.out 2>&1
+echo RETVAL: $? >> ${testsdir}/${testname}/q.out
+if [ ! -e ${testsdir}/${testname}/skip-unboundhost ]
 then
-       unbound-host -v -C unbound-host.conf -t $2 $1 > $testname/unbound-host.out 2>&1
-       echo RETVAL: $? >> $testname/unbound-host.out
+       unbound-host -v -C unbound-host.conf -t $2 $1 > ${testsdir}/${testname}/unbound-host.out 2>&1
+       echo RETVAL: $? >> ${testsdir}/${testname}/unbound-host.out
 fi
-if [ -f $testname/use.drill ]
+if [ -f ${testsdir}/${testname}/use.drill ]
 then
-       cat $testname/drill.out
+       cat ${testsdir}/${testname}/drill.out
 fi
-grep -i bogus $testname/*.out
+grep -i bogus ${testsdir}/${testname}/*.out

diff --git a/regression-tests/runtests b/regression-tests/runtests
index 8a137adeeba012f2816528909ec11d11936f07b5..39a00b967ff908eff71b1a48f1aaee687fc7d515 100755 (executable)
--- a/regression-tests/runtests
+++ b/regression-tests/runtests
@@ -3,7 +3,7 @@ PATH=.:$PATH
 
 make -C ../pdns sdig nsec3dig || exit 1
 
-rm -f test-results failed_tests passed_tests skipped_tests ${testsdir}/*/real_result ${testdir}/*/diff ${testdir}/*/*.out
+rm -f test-results failed_tests passed_tests skipped_tests ${testsdir}/*/real_result ${testsdir}/*/diff ${testsdir}/*/*.out
 
 passed=0
 failed=0