change zone backup during tests to zone restore

diff --git a/regression-tests/.gitignore b/regression-tests/.gitignore
index 0f10075d14b14fcae6095af8c22937f724cc65f2..679c13c93579060f874d31b2e76247fb2c11eec2 100644 (file)
--- 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 05bbd107b5e62eddc4623b51d8cdff79c235b22d..759c8a134654658f8f12a7fbac784fb4437b82cc 100755 (executable)
--- 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