X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=regression-tests%2Fruntests;h=3060051fc264766ac4334ab3ca8a6e37550797b3;hb=90f24c22d4084c0587cf52b412b7f0b020fccf5a;hp=b701dee74315e9c6ae0ee19a8ca3283171daa83f;hpb=22d8fdd0517afdd1eed960069f6f2dd0b34fb165;p=thirdparty%2Fpdns.git

diff --git a/regression-tests/runtests b/regression-tests/runtests
index b701dee743..3060051fc2 100755
--- a/regression-tests/runtests
+++ b/regression-tests/runtests
@@ -16,11 +16,13 @@ export ZONE2LDAP=${ZONE2LDAP:-${PWD}/../pdns/zone2ldap}
 export PDNSUTIL=${PDNSUTIL:-${PWD}/../pdns/pdnsutil}
 export PDNSCONTROL=${PDNSCONTROL:-${PWD}/../pdns/pdns_control}
 
+unset _JAVA_OPTIONS
+
 spectest=$1
 [ -z $spectest ] && spectest=""
 
 for prog in $SDIG $SAXFR $NOTIFY $NSEC3DIG; do
-  if `echo $prog | grep -q '../pdns'`; then
+  if `echo $prog | grep -q '\.\./pdns'`; then
     ${MAKE} -C ../pdns ${prog##*../pdns/} || exit
   fi
 done
@@ -47,7 +49,9 @@ do
 	testname=$(basename $a)
 	export testname
 	echo  "$testname: "
-	cat $a/description 
+	if [ "${PDNS_DEBUG}" = "YES" ]; then
+		cat $a/description
+	fi
 
 	echo  "$testname: " >> test-results
 	cat $a/description >> test-results
@@ -113,6 +117,11 @@ do
 				result="	Failed test $a"
 				echo $testname >> failed_tests
 				failed=$[$failed+1]
+				if [ "$FIX_TESTS" == "YES" ]
+				then
+					mv -f $a/real_result $expected
+					result="$result (fixed)"
+				fi
 			else
 				result="	Expected failure for reason $reason, test passed $a"
 				echo $testname >> passed_tests