- Remove debug commands from reuse tests.

diff --git a/doc/Changelog b/doc/Changelog
index 646c7f6fe901d4c4d666368a45b846d9c569c03c..4d8c52d66dd115bf8b31e3b563e05c438fd33918 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -3,6 +3,7 @@
        - Fix udp-connect on FreeBSD, do send calls on connected UDP socket.
        - Better fix for reuse tree comparison for is-tls sockets.  Where
          the tree key identity is preserved after cleanup of the TLS state.
+       - Remove debug commands from reuse tests.
 
 24 November 2020: Wouter
        - Merge PR #283 : Stream reuse.  This implements upstream stream

diff --git a/testdata/tcp_reuse.tdir/tcp_reuse.pre b/testdata/tcp_reuse.tdir/tcp_reuse.pre
index 30dbdc96f4226ed0f402bbf5c27339268720f8ed..511dbc6f73f5fbc916bd8f128e472c15d503c8e6 100644 (file)
--- a/testdata/tcp_reuse.tdir/tcp_reuse.pre
+++ b/testdata/tcp_reuse.tdir/tcp_reuse.pre
@@ -16,7 +16,7 @@ echo "UPSTREAM_PORT=$UPSTREAM_PORT" >> .tpkg.var.test
 sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$UPSTREAM_PORT'/' < tcp_reuse.conf > ub.conf
 # start unbound in the background
 #$PRE/unbound -d -c ub.conf >unbound.log 2>&1 &
-valgrind $PRE/unbound -d -c ub.conf 2>&1 | tee unbound.log &
+$PRE/unbound -d -c ub.conf 2>&1 | tee unbound.log &
 UNBOUND_PID=$!
 echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test
 wait_unbound_up unbound.log

diff --git a/testdata/tls_reuse.tdir/tls_reuse.pre b/testdata/tls_reuse.tdir/tls_reuse.pre
index ddd6ff4d390f199dc9f60c8b3c2163ed48756a08..f4ba26372da7f5666e7e11501e3adf0cfbf49b98 100644 (file)
--- a/testdata/tls_reuse.tdir/tls_reuse.pre
+++ b/testdata/tls_reuse.tdir/tls_reuse.pre
@@ -16,7 +16,7 @@ echo "UPSTREAM_PORT=$UPSTREAM_PORT" >> .tpkg.var.test
 sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$UPSTREAM_PORT'/' < tls_reuse.conf > ub.conf
 # start unbound in the background
 #$PRE/unbound -d -c ub.conf >unbound.log 2>&1 &
-valgrind $PRE/unbound -d -c ub.conf 2>&1 | tee unbound.log &
+$PRE/unbound -d -c ub.conf 2>&1 | tee unbound.log &
 UNBOUND_PID=$!
 echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test
 wait_unbound_up unbound.log