From 3c2b1fa801990def492ab941c85cc5f16f0f589e Mon Sep 17 00:00:00 2001 From: "W.C.A. Wijngaards" Date: Wed, 25 Nov 2020 12:02:51 +0100 Subject: [PATCH] - Remove debug commands from reuse tests. --- doc/Changelog | 1 + testdata/tcp_reuse.tdir/tcp_reuse.pre | 2 +- testdata/tls_reuse.tdir/tls_reuse.pre | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/Changelog b/doc/Changelog index 646c7f6fe..4d8c52d66 100644 --- 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 30dbdc96f..511dbc6f7 100644 --- 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 ddd6ff4d3..f4ba26372 100644 --- 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