From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Mon, 23 Nov 2020 08:35:58 +0000 (+0100)
Subject: stream reuse, rename ssl_reuse test to tls_reuse test.
X-Git-Tag: release-1.13.0rc1~5^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd94b0bc9befe5db80cc041a42cf66fe98724cf9;p=thirdparty%2Funbound.git

stream reuse, rename ssl_reuse test to tls_reuse test.
---

diff --git a/testdata/tls_reuse.tdir/tls_reuse.dsc b/testdata/tls_reuse.tdir/tls_reuse.dsc
index ab2b67f66..76a80cdad 100644
--- a/testdata/tls_reuse.tdir/tls_reuse.dsc
+++ b/testdata/tls_reuse.tdir/tls_reuse.dsc
@@ -1,6 +1,6 @@
-BaseName: ssl_reuse
+BaseName: tls_reuse
 Version: 1.0
-Description: Test ssl stream reuse.
+Description: Test tls stream reuse.
 CreationDate: Wed Jun 30 16:37:00 CET 2020
 Maintainer: Wouter Wijngaards
 Category: 
@@ -8,9 +8,9 @@ Component:
 CmdDepends: 
 Depends: 
 Help:
-Pre: ssl_reuse.pre
-Post: ssl_reuse.post
-Test: ssl_reuse.test
+Pre: tls_reuse.pre
+Post: tls_reuse.post
+Test: tls_reuse.test
 AuxFiles: 
 Passed:
 Failure:
diff --git a/testdata/tls_reuse.tdir/tls_reuse.post b/testdata/tls_reuse.tdir/tls_reuse.post
index 4337af204..2eef0da96 100644
--- a/testdata/tls_reuse.tdir/tls_reuse.post
+++ b/testdata/tls_reuse.tdir/tls_reuse.post
@@ -1,4 +1,4 @@
-# #-- ssl_reuse.post --#
+# #-- tls_reuse.post --#
 # source the master var file when it's there
 [ -f ../.tpkg.var.master ] && source ../.tpkg.var.master
 # source the test var file when it's there
diff --git a/testdata/tls_reuse.tdir/tls_reuse.pre b/testdata/tls_reuse.tdir/tls_reuse.pre
index 048ca6813..ddd6ff4d3 100644
--- a/testdata/tls_reuse.tdir/tls_reuse.pre
+++ b/testdata/tls_reuse.tdir/tls_reuse.pre
@@ -1,4 +1,4 @@
-# #-- ssl_reuse.pre--#
+# #-- tls_reuse.pre--#
 # source the master var file when it's there
 [ -f ../.tpkg.var.master ] && source ../.tpkg.var.master
 # use .tpkg.var.test for in test variable passing
@@ -13,7 +13,7 @@ echo "UNBOUND_PORT=$UNBOUND_PORT" >> .tpkg.var.test
 echo "UPSTREAM_PORT=$UPSTREAM_PORT" >> .tpkg.var.test
 
 # make config file
-sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$UPSTREAM_PORT'/' < ssl_reuse.conf > ub.conf
+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 &
@@ -22,7 +22,7 @@ echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test
 wait_unbound_up unbound.log
 
 # make upstream config file
-sed -e 's/@PORT\@/'$UPSTREAM_PORT'/' -e 's/@TOPORT\@/'$UPSTREAM_PORT'/' < ssl_reuse.conf2 > ub2.conf
+sed -e 's/@PORT\@/'$UPSTREAM_PORT'/' -e 's/@TOPORT\@/'$UPSTREAM_PORT'/' < tls_reuse.conf2 > ub2.conf
 # start upstream unbound in the background
 #$PRE/unbound -d -c ub2.conf >unbound2.log 2>&1 &
 $PRE/unbound -d -c ub2.conf 2>&1 | tee unbound2.log &
diff --git a/testdata/tls_reuse.tdir/tls_reuse.test b/testdata/tls_reuse.tdir/tls_reuse.test
index d0106c17e..fe488cbb2 100644
--- a/testdata/tls_reuse.tdir/tls_reuse.test
+++ b/testdata/tls_reuse.tdir/tls_reuse.test
@@ -1,4 +1,4 @@
-# #-- ssl_reuse.test --#
+# #-- tls_reuse.test --#
 # source the master var file when it's there
 [ -f ../.tpkg.var.master ] && source ../.tpkg.var.master
 # use .tpkg.var.test for in test variable passing