From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Wed, 26 Jul 2023 14:41:14 +0000 (-0400)
Subject: Remove timestamp
X-Git-Tag: rec-5.0.0-alpha2~37^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=30a57c3d42e8007ba35c5a191230c0a78f71fdd8;p=thirdparty%2Fpdns.git

Remove timestamp

CI systems provide their own timestamps

This will make it easier for tests to use `::error` to talk to GitHub Actions
---

diff --git a/build-scripts/test-auth b/build-scripts/test-auth
index 095d6a8ee0..6812dd7165 100755
--- a/build-scripts/test-auth
+++ b/build-scripts/test-auth
@@ -58,53 +58,53 @@ EXITCODE=0
 
 if [ -z "$context" ]; then
 	export geoipregion=oc geoipregionip=1.2.3.4
-	./timestamp ./start-test-stop 5300 bind-both || EXITCODE=1
-	./timestamp ./start-test-stop 5300 bind-dnssec-both || EXITCODE=1
+	./start-test-stop 5300 bind-both || EXITCODE=1
+	./start-test-stop 5300 bind-dnssec-both || EXITCODE=1
 
 	# No PKCS#11 in packages
-	#SETUP_SOFTHSM=y ./timestamp ./start-test-stop 5300 bind-dnssec-pkcs11 || EXITCODE=1
-	./timestamp ./start-test-stop 5300 bind-dnssec-nsec3-both || EXITCODE=1
-	./timestamp ./start-test-stop 5300 bind-dnssec-nsec3-optout-both || EXITCODE=1
-	./timestamp ./start-test-stop 5300 bind-dnssec-nsec3-narrow || EXITCODE=1
-	./timestamp ./start-test-stop 5300 bind-hybrid-nsec3 || EXITCODE=1
+	#SETUP_SOFTHSM=y ./start-test-stop 5300 bind-dnssec-pkcs11 || EXITCODE=1
+	./start-test-stop 5300 bind-dnssec-nsec3-both || EXITCODE=1
+	./start-test-stop 5300 bind-dnssec-nsec3-optout-both || EXITCODE=1
+	./start-test-stop 5300 bind-dnssec-nsec3-narrow || EXITCODE=1
+	./start-test-stop 5300 bind-hybrid-nsec3 || EXITCODE=1
 
 	# Adding extra IPs to docker containers in not supported :(
-	#./timestamp ./start-test-stop 5300 geoipbackend || EXITCODE=1
-	#./timestamp ./start-test-stop 5300 geoipbackend-nsec3-narrow || EXITCODE=1
-
-	./timestamp ./start-test-stop 5300 gmysql-nodnssec-both || EXITCODE=1
-	./timestamp ./start-test-stop 5300 gmysql-both || EXITCODE=1
-	./timestamp ./start-test-stop 5300 gmysql-nsec3-both || EXITCODE=1
-	./timestamp ./start-test-stop 5300 gmysql-nsec3-optout-both || EXITCODE=1
-	./timestamp ./start-test-stop 5300 gmysql-nsec3-narrow || EXITCODE=1
-
-	./timestamp ./start-test-stop 5300 gpgsql-nodnssec-both || EXITCODE=1
-	./timestamp ./start-test-stop 5300 gpgsql-both || EXITCODE=1
-	./timestamp ./start-test-stop 5300 gpgsql-nsec3-both || EXITCODE=1
-	./timestamp ./start-test-stop 5300 gpgsql-nsec3-optout-both || EXITCODE=1
-	./timestamp ./start-test-stop 5300 gpgsql-nsec3-narrow || EXITCODE=1
-
-	./timestamp ./start-test-stop 5300 gsqlite3-nodnssec-both || EXITCODE=1
-	./timestamp ./start-test-stop 5300 gsqlite3-both || EXITCODE=1
-	./timestamp ./start-test-stop 5300 gsqlite3-nsec3-both || EXITCODE=1
-	./timestamp ./start-test-stop 5300 gsqlite3-nsec3-optout-both || EXITCODE=1
-	./timestamp ./start-test-stop 5300 gsqlite3-nsec3-narrow || EXITCODE=1
-
-	./timestamp timeout 120s ./start-test-stop 5300 remotebackend-pipe || EXITCODE=1
-	./timestamp timeout 120s ./start-test-stop 5300 remotebackend-pipe-dnssec || EXITCODE=1
-	./timestamp timeout 120s ./start-test-stop 5300 remotebackend-unix || EXITCODE=1
-	./timestamp timeout 120s ./start-test-stop 5300 remotebackend-unix-dnssec || EXITCODE=1
-	./timestamp timeout 120s ./start-test-stop 5300 remotebackend-http || EXITCODE=1
-	./timestamp timeout 120s ./start-test-stop 5300 remotebackend-http-dnssec || EXITCODE=1
-
-	./timestamp timeout 120s ./start-test-stop 5300 lua2
-	./timestamp timeout 120s ./start-test-stop 5300 lua2-dnssec
+	#./start-test-stop 5300 geoipbackend || EXITCODE=1
+	#./start-test-stop 5300 geoipbackend-nsec3-narrow || EXITCODE=1
+
+	./start-test-stop 5300 gmysql-nodnssec-both || EXITCODE=1
+	./start-test-stop 5300 gmysql-both || EXITCODE=1
+	./start-test-stop 5300 gmysql-nsec3-both || EXITCODE=1
+	./start-test-stop 5300 gmysql-nsec3-optout-both || EXITCODE=1
+	./start-test-stop 5300 gmysql-nsec3-narrow || EXITCODE=1
+
+	./start-test-stop 5300 gpgsql-nodnssec-both || EXITCODE=1
+	./start-test-stop 5300 gpgsql-both || EXITCODE=1
+	./start-test-stop 5300 gpgsql-nsec3-both || EXITCODE=1
+	./start-test-stop 5300 gpgsql-nsec3-optout-both || EXITCODE=1
+	./start-test-stop 5300 gpgsql-nsec3-narrow || EXITCODE=1
+
+	./start-test-stop 5300 gsqlite3-nodnssec-both || EXITCODE=1
+	./start-test-stop 5300 gsqlite3-both || EXITCODE=1
+	./start-test-stop 5300 gsqlite3-nsec3-both || EXITCODE=1
+	./start-test-stop 5300 gsqlite3-nsec3-optout-both || EXITCODE=1
+	./start-test-stop 5300 gsqlite3-nsec3-narrow || EXITCODE=1
+
+	timeout 120s ./start-test-stop 5300 remotebackend-pipe || EXITCODE=1
+	timeout 120s ./start-test-stop 5300 remotebackend-pipe-dnssec || EXITCODE=1
+	timeout 120s ./start-test-stop 5300 remotebackend-unix || EXITCODE=1
+	timeout 120s ./start-test-stop 5300 remotebackend-unix-dnssec || EXITCODE=1
+	timeout 120s ./start-test-stop 5300 remotebackend-http || EXITCODE=1
+	timeout 120s ./start-test-stop 5300 remotebackend-http-dnssec || EXITCODE=1
+
+	timeout 120s ./start-test-stop 5300 lua2
+	timeout 120s ./start-test-stop 5300 lua2-dnssec
 
 	# No 0MQ in the PowerDNS packages
-	#./timestamp timeout 120s ./start-test-stop 5300 remotebackend-zeromq || EXITCODE=1
-	#./timestamp timeout 120s ./start-test-stop 5300 remotebackend-zeromq-dnssec || EXITCODE=1
+	#timeout 120s ./start-test-stop 5300 remotebackend-zeromq || EXITCODE=1
+	#timeout 120s ./start-test-stop 5300 remotebackend-zeromq-dnssec || EXITCODE=1
 
-	./timestamp ./start-test-stop 5300 tinydns || EXITCODE=1
+	./start-test-stop 5300 tinydns || EXITCODE=1
 
 	cd ../regression-tests.nobackend/
 
@@ -133,15 +133,15 @@ __EOF__
 	. ~/.mssql-credentials
 	set -x
 	export GODBC_SQLITE3_DSN=pdns-sqlite3-1
-	./timestamp timeout 120s ./start-test-stop 5300 godbc_sqlite3-nodnssec || EXITCODE=1
+	timeout 120s ./start-test-stop 5300 godbc_sqlite3-nodnssec || EXITCODE=1
 	export GODBC_MSSQL_DSN=pdns-mssql
 	export GODBC_MSSQL_USERNAME
 	export GODBC_MSSQL_PASSWORD
-	./timestamp timeout 3600s ./start-test-stop 5300 godbc_mssql-nodnssec || EXITCODE=1
-	./timestamp timeout 3600s ./start-test-stop 5300 godbc_mssql || EXITCODE=1
-	./timestamp timeout 3600s ./start-test-stop 5300 godbc_mssql-nsec3 || EXITCODE=1
-	./timestamp timeout 3600s ./start-test-stop 5300 godbc_mssql-nsec3-optout || EXITCODE=1
-	./timestamp timeout 3600s ./start-test-stop 5300 godbc_mssql-nsec3-narrow || EXITCODE=1
+	timeout 3600s ./start-test-stop 5300 godbc_mssql-nodnssec || EXITCODE=1
+	timeout 3600s ./start-test-stop 5300 godbc_mssql || EXITCODE=1
+	timeout 3600s ./start-test-stop 5300 godbc_mssql-nsec3 || EXITCODE=1
+	timeout 3600s ./start-test-stop 5300 godbc_mssql-nsec3-optout || EXITCODE=1
+	timeout 3600s ./start-test-stop 5300 godbc_mssql-nsec3-narrow || EXITCODE=1
 fi
 
 exit $EXITCODE
diff --git a/regression-tests/timestamp b/regression-tests/timestamp
deleted file mode 100755
index 1a76f316af..0000000000
--- a/regression-tests/timestamp
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-"$@" 2>&1 | ts "[%F %T]"
-
-exit ${PIPESTATUS[0]}
diff --git a/tasks.py b/tasks.py
index e78e0a5521..1da2c6bf92 100644
--- a/tasks.py
+++ b/tasks.py
@@ -805,7 +805,7 @@ def test_bulk_recursor(c, threads, mthreads, shards):
         c.run('curl -LO http://s3-us-west-1.amazonaws.com/umbrella-static/top-1m.csv.zip')
         c.run('unzip top-1m.csv.zip -d .')
         c.run('chmod +x /opt/pdns-recursor/bin/* /opt/pdns-recursor/sbin/*')
-        c.run(f'DNSBULKTEST=/usr/bin/dnsbulktest RECURSOR=/opt/pdns-recursor/sbin/pdns_recursor RECCONTROL=/opt/pdns-recursor/bin/rec_control THRESHOLD=95 TRACE=no ./timestamp ./recursor-test 5300 100 {threads} {mthreads} {shards}')
+        c.run(f'DNSBULKTEST=/usr/bin/dnsbulktest RECURSOR=/opt/pdns-recursor/sbin/pdns_recursor RECCONTROL=/opt/pdns-recursor/bin/rec_control THRESHOLD=95 TRACE=no ./recursor-test 5300 100 {threads} {mthreads} {shards}')
 
 @task
 def install_swagger_tools(c):