Revert "Add timestamps to messages"

This reverts commit f8fe35e9809f7c5c35373c2487f1c685c0d72c8f.

diff --git a/regression-tests/backends/bind-slave b/regression-tests/backends/bind-slave
index 109c47861e477efc65cf07845bb9fa07a2644d28..28b224792a538a90a976840d27a6c30fed423b0c 100644 (file)
--- a/regression-tests/backends/bind-slave
+++ b/regression-tests/backends/bind-slave
@@ -31,5 +31,5 @@
                --send-root-referral --retrieval-threads=1  --config-name=bind-slave \
                --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \
                --cache-ttl=$cachettl --no-config --experimental-dname-processing --bind-dnssec-db=./dnssec-slave.sqlite3 &
-       dolog 'waiting for zones to be loaded'
+       echo 'waiting for zones to be loaded'
        bindwait bind-slave

diff --git a/regression-tests/backends/common b/regression-tests/backends/common
index 23fb864faf99df123f95cafc82521520a1b0b4c2..e420b87bbc590ac8c812998b89218bbfddee373a 100644 (file)
--- a/regression-tests/backends/common
+++ b/regression-tests/backends/common
@@ -55,7 +55,7 @@ start_master ()
 
        if [ "$nocontext" == "yes" ]
        then
-               dolog unknown context $context
+               echo unknown context $context
                : > passed_tests
                echo 'unknown-context-'"$context" > failed_tests
                ./toxml $context
@@ -106,7 +106,7 @@ start_slave ()
 
        if [ "$nocontext" == "yes" ]
        then
-               dolog unknown presigned context $presignedcontext
+               echo unknown presigned context $presignedcontext
                : > passed_tests
                echo 'unknown-presigned-context-'"$presignedcontext" > failed_tests
                ./toxml $context

diff --git a/regression-tests/backends/gmysql-slave b/regression-tests/backends/gmysql-slave
index 1fd561ec109c2a2b17f149452c1028e56dccbfba..568a87b48cbbf4381e3482f0f962510550e676a9 100644 (file)
--- a/regression-tests/backends/gmysql-slave
+++ b/regression-tests/backends/gmysql-slave
@@ -44,7 +44,7 @@ __EOF__
                --send-root-referral --slave --retrieval-threads=4 \
                --slave-cycle-interval=300 --experimental-dname-processing &
 
-       dolog 'waiting for zones to be slaved'
+       echo 'waiting for zones to be slaved'
        loopcount=0
        while [ $loopcount -lt 30 ]
        do

diff --git a/regression-tests/backends/goracle-slave b/regression-tests/backends/goracle-slave
index 5f47ed529ec3b5b2ba5f7a42e1de273fea7376f5..4403ed44322144dc9caa81fbb284d8b40be7e281 100644 (file)
--- a/regression-tests/backends/goracle-slave
+++ b/regression-tests/backends/goracle-slave
@@ -40,7 +40,7 @@ __EOF__
                --send-root-referral --slave --retrieval-threads=4 \
                --slave-cycle-interval=300 --experimental-dname-processing &
 
-       dolog 'waiting for zones to be slaved'
+       echo 'waiting for zones to be slaved'
        loopcount=0
        while [ $loopcount -lt 30 ]
        do

diff --git a/regression-tests/backends/gpgsql-slave b/regression-tests/backends/gpgsql-slave
index 5768273f9f80e85bf85dc5dc68778e01f66877b5..0b8bb43648fa281fd8f84bd50163a1322b099c3f 100644 (file)
--- a/regression-tests/backends/gpgsql-slave
+++ b/regression-tests/backends/gpgsql-slave
@@ -37,7 +37,7 @@ __EOF__
                --send-root-referral --slave --retrieval-threads=4 \
                --slave-cycle-interval=300 --experimental-dname-processing &
 
-       dolog 'waiting for zones to be slaved'
+       echo 'waiting for zones to be slaved'
        loopcount=0
        while [ $loopcount -lt 30 ]
        do

diff --git a/regression-tests/backends/gsqlite3-slave b/regression-tests/backends/gsqlite3-slave
index 930c83a724c9af171931ef1aea42c321ef7302ce..486e30bfafcc838d0f10f5807565388d2dd5ae04 100644 (file)
--- a/regression-tests/backends/gsqlite3-slave
+++ b/regression-tests/backends/gsqlite3-slave
@@ -32,7 +32,7 @@ __EOF__
                --send-root-referral --slave --retrieval-threads=4 \
                --slave-cycle-interval=300 --experimental-dname-processing &
 
-       dolog 'waiting for zones to be slaved'
+       echo 'waiting for zones to be slaved'
        set +e
        loopcount=0
        while [ $loopcount -lt 30 ]

diff --git a/regression-tests/backends/oracle-slave b/regression-tests/backends/oracle-slave
index 318ca2536a019dbaf9220196e31634d32874e0cc..f9121caaf3ce746d29ed91a22db7df88c9b90c99 100644 (file)
--- a/regression-tests/backends/oracle-slave
+++ b/regression-tests/backends/oracle-slave
@@ -42,7 +42,7 @@ __EOF__
                --config-name=oracle2 --socket-dir=./ --no-shuffle \
                --send-root-referral --slave --retrieval-threads=4 \
                --slave-cycle-interval=300 --experimental-dname-processing &
-       dolog 'waiting for zones to be slaved'
+       echo 'waiting for zones to be slaved'
 
        loopcount=0
        while [ $loopcount -lt 40 ]

diff --git a/regression-tests/backends/remote-master b/regression-tests/backends/remote-master
index 64826f04c17d03384584c0fca040a09095cccadb..9d9fb81f6a52abaeb5d077e25ffe91003f105ff2 100644 (file)
--- a/regression-tests/backends/remote-master
+++ b/regression-tests/backends/remote-master
@@ -8,7 +8,7 @@ case $context in
                # cleanup unbound-host.conf to avoid failures
                rm -f unbound-host.conf
 
-               dolog "Setting up test database..."
+               echo "Setting up test database..."
                # setup test database
                rm -f $testsdir/remote.sqlite3
                sqlite3 $testsdir/remote.sqlite3 < $testsdir/test-schema.sql
@@ -49,7 +49,7 @@ case $context in
                        connstr="pipe:command=$testsdir/pipe-backend.rb"
                        ;;
                *)
-                       dolog "Invalid usage"
+                       echo "Invalid usage"
                        exit
                        ;;
                esac

diff --git a/regression-tests/runtests b/regression-tests/runtests
index 3823494f8e78e89db3151239eb5fe36de24b2bee..af89860300b4f5862f460cd93a15df29d020fc6b 100755 (executable)
--- a/regression-tests/runtests
+++ b/regression-tests/runtests
@@ -1,10 +1,4 @@
 #!/usr/bin/env bash
-
-dolog()
-{
-        echo "[$(date "+%F %R:%S.%N")] $*"
-}
-
 PATH=.:$PATH:/usr/sbin
 MAKE=${MAKE:-make}
 
@@ -29,7 +23,7 @@ do
        fi
        testname=$(basename $a)
        export testname
-       dolog "$testname: "
+       echo  "$testname: "
        cat $a/description 
 
        echo  "$testname: " >> test-results
@@ -83,15 +77,14 @@ do
                        passed=$[$passed+1]
                fi
        fi      
-       dolog "$result"
+       echo "$result"
        echo
        echo "$result" >> test-results
        echo >> test-results
 done
 
-echo -n "[$(date "+%F %R:%S.%N")] "
 echo -n $passed out of $[$passed+$failed]
 echo -n " ("
 res=$((echo scale=2; echo 100*$passed/\($passed+$failed\)) | bc )
 echo -n "$res%) "
-dolog tests passed, $skipped were skipped
+echo tests passed, $skipped were skipped

diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop
index 5b33e470a3b7e7b4d9164f7c9965217199a8374c..6b4f2f30a9710221f616f0f269ea86d972ef010f 100755 (executable)
--- a/regression-tests/start-test-stop
+++ b/regression-tests/start-test-stop
@@ -15,11 +15,6 @@ export KEY
 
 trap "kill_process 2" EXIT INT TERM
 
-dolog()
-{
-       echo "[$(date "+%F %R:%S.%N")] $*"
-}
-
 tosql ()
 {
        ${MAKE} -C ../pdns zone2sql > /dev/null
@@ -33,7 +28,7 @@ bindwait ()
        domcount=$(grep -c ^zone named.conf)
        if [ ! -x ../pdns/pdns_control ]
        then
-               dolog "No pdns_control found"
+               echo "No pdns_control found"
                exit
        fi
        loopcount=0
@@ -154,13 +149,13 @@ kill_process ()
 
 if [ ! -x $PDNS ]
  then
-       dolog "$PDNS is not executable binary"
+       echo "$PDNS is not executable binary"
        exit
 fi
 
 if [ ! -x $PDNS2 ]
 then
-       dolog "$PDNS2 is not executable binary"
+       echo "$PDNS2 is not executable binary"
        exit
 fi
 
@@ -335,7 +330,7 @@ fi
 
 if [ "$wait" = "wait" ]
 then
-       dolog "tests done! push enter to terminate instance"
+       echo tests done! push enter to terminate instance
        read l
 fi