From f8fe35e9809f7c5c35373c2487f1c685c0d72c8f Mon Sep 17 00:00:00 2001 From: Aki Tuomi Date: Tue, 3 Jun 2014 13:00:29 +0300 Subject: [PATCH] Add timestamps to messages --- regression-tests/backends/bind-slave | 2 +- regression-tests/backends/common | 4 ++-- regression-tests/backends/gmysql-slave | 2 +- regression-tests/backends/goracle-slave | 2 +- regression-tests/backends/gpgsql-slave | 2 +- regression-tests/backends/gsqlite3-slave | 2 +- regression-tests/backends/oracle-slave | 2 +- regression-tests/backends/remote-master | 4 ++-- regression-tests/runtests | 13 ++++++++++--- regression-tests/start-test-stop | 13 +++++++++---- 10 files changed, 29 insertions(+), 17 deletions(-) diff --git a/regression-tests/backends/bind-slave b/regression-tests/backends/bind-slave index 28b224792a..109c47861e 100644 --- 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 & - echo 'waiting for zones to be loaded' + dolog 'waiting for zones to be loaded' bindwait bind-slave diff --git a/regression-tests/backends/common b/regression-tests/backends/common index e420b87bbc..23fb864faf 100644 --- a/regression-tests/backends/common +++ b/regression-tests/backends/common @@ -55,7 +55,7 @@ start_master () if [ "$nocontext" == "yes" ] then - echo unknown context $context + dolog unknown context $context : > passed_tests echo 'unknown-context-'"$context" > failed_tests ./toxml $context @@ -106,7 +106,7 @@ start_slave () if [ "$nocontext" == "yes" ] then - echo unknown presigned context $presignedcontext + dolog 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 568a87b48c..1fd561ec10 100644 --- 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 & - echo 'waiting for zones to be slaved' + dolog '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 4403ed4432..5f47ed529e 100644 --- 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 & - echo 'waiting for zones to be slaved' + dolog '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 0b8bb43648..5768273f9f 100644 --- 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 & - echo 'waiting for zones to be slaved' + dolog '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 486e30bfaf..930c83a724 100644 --- 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 & - echo 'waiting for zones to be slaved' + dolog '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 f9121caaf3..318ca2536a 100644 --- 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 & - echo 'waiting for zones to be slaved' + dolog '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 9d9fb81f6a..64826f04c1 100644 --- 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 - echo "Setting up test database..." + dolog "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" ;; *) - echo "Invalid usage" + dolog "Invalid usage" exit ;; esac diff --git a/regression-tests/runtests b/regression-tests/runtests index af89860300..3823494f8e 100755 --- a/regression-tests/runtests +++ b/regression-tests/runtests @@ -1,4 +1,10 @@ #!/usr/bin/env bash + +dolog() +{ + echo "[$(date "+%F %R:%S.%N")] $*" +} + PATH=.:$PATH:/usr/sbin MAKE=${MAKE:-make} @@ -23,7 +29,7 @@ do fi testname=$(basename $a) export testname - echo "$testname: " + dolog "$testname: " cat $a/description echo "$testname: " >> test-results @@ -77,14 +83,15 @@ do passed=$[$passed+1] fi fi - echo "$result" + dolog "$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%) " -echo tests passed, $skipped were skipped +dolog tests passed, $skipped were skipped diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop index 74882df638..766f01f90c 100755 --- a/regression-tests/start-test-stop +++ b/regression-tests/start-test-stop @@ -15,6 +15,11 @@ export KEY trap "kill_process 2" EXIT INT TERM +dolog() +{ + echo "[$(date "+%F %R:%S.%N")] $*" +} + tosql () { ${MAKE} -C ../pdns zone2sql > /dev/null @@ -28,7 +33,7 @@ bindwait () domcount=$(grep -c ^zone named.conf) if [ ! -x ../pdns/pdns_control ] then - echo "No pdns_control found" + dolog "No pdns_control found" exit fi loopcount=0 @@ -149,13 +154,13 @@ kill_process () if [ ! -x $PDNS ] then - echo "$PDNS is not executable binary" + dolog "$PDNS is not executable binary" exit fi if [ ! -x $PDNS2 ] then - echo "$PDNS2 is not executable binary" + dolog "$PDNS2 is not executable binary" exit fi @@ -330,7 +335,7 @@ fi if [ "$wait" = "wait" ] then - echo tests done! push enter to terminate instance + dolog "tests done! push enter to terminate instance" read l fi -- 2.47.2