Fix the rec_control manual test

Ensure it does not fail silently on no output from rec_control

Closes #3944

diff --git a/regression-tests.recursor/rec_control-manpage/command b/regression-tests.recursor/rec_control-manpage/command
index de6ec8772bede6e320f0354c2e01542f7fac18cf..bbcaa9e7707b671341f24f2c9f3f50958e02927c 100755 (executable)
--- a/regression-tests.recursor/rec_control-manpage/command
+++ b/regression-tests.recursor/rec_control-manpage/command
@@ -1,12 +1,19 @@
 #!/bin/sh
-elements="$($RECCONTROL --config-dir=./config/recursor-service help | grep -v -e '^ ' | awk '{print $1}')"
+elements="$($RECCONTROL --config-dir=./configs/recursor-service help | grep -v -e '^ ' | awk '{print $1}')"
+
+num_elems="$( echo $elements | wc -l)"
+
+if [ $num_elems -lt 5 ]; then
+  echo "Not enough elements"
+  exit 1
+fi
 
 missing_elements=""
 for element in $elements; do
   grep -e -q "^$element" ../docs/manpages/rec_control.1.md || missing_elements="$element\n$missing_elements"
 done
 
-if [ $missing_elements != "" ]; then
+if [ "x$missing_elements" != "x" ]; then
   echo "The following commands are missing from the manpage:\n"
   echo $missing_elements
 fi

diff --git a/regression-tests/runtests b/regression-tests/runtests
index 45f11992f8e82ffabebd16f1fa0999515b764983..e0edbffdc2169f5d2c407f8e8de65b465211a078 100755 (executable)
--- a/regression-tests/runtests
+++ b/regression-tests/runtests
@@ -4,8 +4,8 @@ MAKE=${MAKE:-make}
 
 export PDNS=${PDNS:-${PWD}/../pdns/pdns_server}
 export PDNS2=${PDNS2:-${PWD}/../pdns/pdns_server}
-export PDNSRECURSOR=${PDNSRECURSOR:-${PWD}/../pdns_recursor}
-export RECCONTROL=${RECCONTROL:-${PWD}/../rec_control}
+export PDNSRECURSOR=${PDNSRECURSOR:-${PWD}/../pdns/recursordist/pdns_recursor}
+export RECCONTROL=${RECCONTROL:-${PWD}/../pdns/recursordist/rec_control}
 export SDIG=${SDIG:-${PWD}/../pdns/sdig}
 export NOTIFY=${NOTIFY:-${PWD}/../pdns/pdns_notify}
 export NSEC3DIG=${NSEC3DIG:-${PWD}/../pdns/nsec3dig}

diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop
index 600484c93e72cd6d36991233325927a52924596d..b11d6d2650c7ce51bbcb82f3a47cdb775dfc4bd1 100755 (executable)
--- a/regression-tests/start-test-stop
+++ b/regression-tests/start-test-stop
@@ -6,8 +6,8 @@ fi
 
 export PDNS=${PDNS:-${PWD}/../pdns/pdns_server}
 export PDNS2=${PDNS2:-${PWD}/../pdns/pdns_server}
-export PDNSRECURSOR=${PDNSRECURSOR:-${PWD}/../pdns_recursor}
-export RECCONTROL=${RECCONTROL:-${PWD}/../rec_control}
+export PDNSRECURSOR=${PDNSRECURSOR:-${PWD}/../pdns/recursordist/pdns_recursor}
+export RECCONTROL=${RECCONTROL:-${PWD}/../pdns/recursordist/rec_control}
 export SDIG=${SDIG:-${PWD}/../pdns/sdig}
 export NOTIFY=${NOTIFY:-${PWD}/../pdns/pdns_notify}
 export NSEC3DIG=${NSEC3DIG:-${PWD}/../pdns/nsec3dig}