From: Aki Tuomi <cmouse@desteem.org>
Date: Fri, 27 Dec 2013 10:35:16 +0000 (+0200)
Subject: Use test-driver when asked
X-Git-Tag: rec-3.6.0-rc1~266^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=991fd7d0848dd96ac3f92bdd4cea7740024fddbf;p=pdns

Use test-driver when asked
---

diff --git a/modules/remotebackend/testrunner.sh b/modules/remotebackend/testrunner.sh
index d0f63c761..e607351dc 100755
--- a/modules/remotebackend/testrunner.sh
+++ b/modules/remotebackend/testrunner.sh
@@ -3,6 +3,9 @@
 new_api=0
 mode=$1
 
+# keep the original arguments for new test harness api
+orig="$*"
+
 # we could be ran with new API
 while [ "$1" != "" ]
 do
@@ -21,7 +24,7 @@ socat=$(which socat)
 
 function start_web() {
   if [ x"$REMOTEBACKEND_HTTP" == "xyes" ]; then
-   ./unittest_$1.rb &
+   ./unittest_$1.rb >> $mode.log 2>&1 & 
    webrick_pid=$!
    loopcount=0
    while [ $loopcount -lt 20 ]; do
@@ -49,7 +52,7 @@ function stop_web() {
 
 function start_zeromq() {
   if [ x"$REMOTEBACKEND_ZEROMQ" == "xyes" ]; then
-   ./unittest_zeromq.rb &
+   ./unittest_zeromq.rb >> $mode.log 2>&1 &
    zeromq_pid=$!
    # need to wait a moment
    sleep 5
@@ -58,7 +61,7 @@ function start_zeromq() {
 
 function stop_zeromq() {
  if [ ! -z "$zeromq_pid" ]; then
-   kill -TERM $zeromq_pid
+   kill -TERM $zeromq_pid 
    # wait a moment for it to die
    i=0
    while [ $i -lt 5 ]; do
@@ -105,21 +108,12 @@ function run_test() {
  if [ $new_api -eq 0 ]; then
    ./$mode
  else
-   ./$mode >> $mode.log
-   rv=$?
-   if [ $rv -eq 0 ]; then
-     echo ":test-result: PASS $1" >> $mode.trs
-   else
-     echo ":test-result: FAIL $1" >> $mode.trs
-   fi
-   echo ":recheck: no" >> $mode.trs
+    $orig
  fi
 }
 
 mode=`basename "$mode"`
 
-echo $mode
-
 case "$mode" in
   test_remotebackend_pipe)
     run_test