Fix couple of no-op tests to actually test something (configuration files were missing)

(cherry picked from commit 60f335204a647ea10de14ccc78f1d2f5ed371aab)

diff --git a/bin/tests/system/runtime/setup.sh b/bin/tests/system/runtime/setup.sh
index a37f8995b68a9733ab21308387879ec1244cd624..a14776aab03fcaca8b5bd4aeb30858a138a709a8 100644 (file)
--- a/bin/tests/system/runtime/setup.sh
+++ b/bin/tests/system/runtime/setup.sh
@@ -17,6 +17,9 @@ copy_setports ns2/named1.conf.in ns2/named.conf
 copy_setports ns2/named-alt1.conf.in ns2/named-alt1.conf
 copy_setports ns2/named-alt2.conf.in ns2/named-alt2.conf
 copy_setports ns2/named-alt3.conf.in ns2/named-alt3.conf
+copy_setports ns2/named-alt4.conf.in ns2/named-alt4.conf
+copy_setports ns2/named-alt5.conf.in ns2/named-alt5.conf
+copy_setports ns2/named-alt6.conf.in ns2/named-alt6.conf
 
 mkdir ns2/nope
 

diff --git a/bin/tests/system/runtime/tests.sh b/bin/tests/system/runtime/tests.sh
index 409c7062a8f96ef31e6c1f15ced102a33685c004..2bdd2813d32076acbd2cab437e671c17bfc339ae 100644 (file)
--- a/bin/tests/system/runtime/tests.sh
+++ b/bin/tests/system/runtime/tests.sh
@@ -155,11 +155,10 @@ status=`expr $status + $ret`
 n=`expr $n + 1`
 echo_i "checking that named starts if managed-keys-directory is writable and working directory is not writable ($n)"
 ret=0
-cd ns2
-$NAMED -c named-alt6.conf -D runtime-ns2-extra-6 -d 99 -g > named6.run 2>&1 &
+cd ns2/nope
+$NAMED -c ../named-alt6.conf -D runtime-ns2-extra-6 -d 99 -g > ../named6.run 2>&1 &
 sleep 2
-grep "exiting (due to fatal error)" named6.run > /dev/null || ret=1
-kill_named named.pid && ret=1
+kill_named ../named.pid || ret=1
 cd ..
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`