From: Kees Monshouwer <mind04@monshouwer.org>
Date: Wed, 24 Jul 2013 19:28:21 +0000 (+0200)
Subject: change zone backup during tests to zone restore
X-Git-Tag: rec-3.6.0-rc1~532^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5d97c2f148e3dd4b181339469d096871e5f0579;p=thirdparty%2Fpdns.git

change zone backup during tests to zone restore
---

diff --git a/regression-tests/.gitignore b/regression-tests/.gitignore
index 0f10075d14..679c13c935 100644
--- a/regression-tests/.gitignore
+++ b/regression-tests/.gitignore
@@ -22,3 +22,4 @@ real_result
 /named-slave.conf
 */start
 */step.*
+/test.dyndns
diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop
index 05bbd107b5..759c8a1346 100755
--- a/regression-tests/start-test-stop
+++ b/regression-tests/start-test-stop
@@ -133,10 +133,13 @@ __EOF__
 fi
 
 make -C ../pdns sdig nsec3dig || exit 1
-# Copy zones because the test might modify them (well only the dyndns stuff, but let's make this work for others as well)
+# Copy original zones because the test might modify them (well only the dyndns stuff, but let's make this work for others as well)
 for zone in $(grep zone named.conf  | cut -f2 -d\")
 do
-       cp $zone $zone.backup
+	if [ -f $zone.orig ]
+	then
+		cp -f $zone.orig $zone
+	fi
 done
 
 rm -f pdns*.pid
@@ -775,11 +778,6 @@ fi
 kill $(cat pdns*.pid)
 rm pdns*.pid
 
-for zone in $(grep zone named.conf  | cut -f2 -d\")
-do
-	mv $zone.backup $zone
-done
-
 if [ -s "./failed_tests" ]
 then
 	for t in `cat failed_tests`
diff --git a/regression-tests/test.dyndns b/regression-tests/test.dyndns.orig
similarity index 100%
rename from regression-tests/test.dyndns
rename to regression-tests/test.dyndns.orig