Reomve tmp debug code and fix two nits in the bulk script

diff --git a/build-scripts/test-recursor-bulk b/build-scripts/test-recursor-bulk
index da30c02dfb2b6a5d1d44cc55497d5cd818d279ce..c91a9a3b6c3209a8f9b24ec4733600c64b83c283 100755 (executable)
--- a/build-scripts/test-recursor-bulk
+++ b/build-scripts/test-recursor-bulk
@@ -13,6 +13,7 @@ set -x
 
 cd regression-tests
 
+rm -f top-1m.csv
 wget -c -N http://s3-us-west-1.amazonaws.com/umbrella-static/top-1m.csv.zip
 
 unzip top-1m.csv.zip
@@ -36,7 +37,7 @@ version=$($PDNSRECURSOR --version 2>&1 | awk '/PowerDNS Recursor/ { print $6 }')
 for IPv6 in 0 1; do
   for CSV in $(ls *.csv); do
     for domains in $numdomains; do
-      export context="${version}_v6:${IPv6}_csv:${CSV%%.*}"
+      export context="${version}_v6:${IPv6}_csv:${CSV%%.*}_domains:${domains}"
       export IPv6
       export CSV
       RECURSOR=$PDNSRECURSOR RECCONTROL=$PDNSRECCONTROL THRESHOLD=0 TRACE=no time ./recursor-test 5401 $domains || EXIT=1

diff --git a/regression-tests/recursor-test b/regression-tests/recursor-test
index df097ab3c802be69d007bf339a62b0051c99a83d..54a109b381f42274dc40d54a5be94e28a4c2dbf0 100755 (executable)
--- a/regression-tests/recursor-test
+++ b/regression-tests/recursor-test
@@ -39,9 +39,6 @@ echo
 echo === First run with limit=$limit threads=$threads mthreads=$mthreads shards=$shards ===
 ${DNSBULKTEST} --www=false -qe 127.0.0.1 $port $limit < ${CSV} > bulktest.results
 echo
-echo "=== XXXX RECURSOR LOG ==="
-cat recursor.log
-echo "=== XXXX END RECURSOR LOG ==="
 kill -USR1 $(cat pdns_recursor.pid)
 ${RECCONTROL} --socket-dir=. --config-dir=. get-all
 # rerun 1 with hot cache