Merge branch '68-rpz-system-test-fails-intermittently' into 'master'

Prevent rpz system test from wiping out forensic data

See merge request !51

CHANGES

+4897.	[test]		Update to rpz system test so that it doesn't recurse.
+			[GL #68]
+
 4896.	[test]		cacheclean system test was not robust. [GL #82]
 
 4895.	[test]		Allow some system tests to run in parallel.

bin/tests/system/rpz/setup.sh

@@ -21,6 +21,7 @@ while getopts "Dx" c; do
     case $c in
 	x) set -x; DEBUG=-x;;
         D) TEST_DNSRPS="-D";;
+	N) NOCLEAN=set;;
 	*) echo "$USAGE" 1>&2; exit 1;;
     esac
 done
@@ -30,7 +31,7 @@ if test "$#" -ne 0; then
     exit 1
 fi
 
-$SHELL clean.sh $DEBUG
+[ ${NOCLEAN:-unset} = unset ] && $SHELL clean.sh $DEBUG
 
 # decide whether to test DNSRPS
 # Note that dnsrps.conf and dnsrps-slave.conf are included in named.conf
@@ -135,6 +136,9 @@ $PERL -e 'for ($cnt = $val = 1; $cnt <= 3000; ++$cnt) {
 cp ns2/bl.tld2.db.in ns2/bl.tld2.db
 cp ns5/empty.db.in ns5/empty.db
 cp ns5/empty.db.in ns5/policy2.db
+rm -f ns2/bl.tld2.db.jnl
+rm -f ns5/empty.db.jnl
+rm -f cp ns5/policy2.db.jnl
 
 # Run dnsrpzd to get the license and prime the static policy zones
 if test -n "$TEST_DNSRPS"; then