- Fix doh tests when not compiled in.

diff --git a/doc/Changelog b/doc/Changelog
index d257816b1e89ddbc709ebf60d67a23c136bea90b..9c84fa5880a3aba67ac534d10bae6bac19a701b6 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+30 September 2020: Wouter
+       - Fix doh tests when not compiled in.
+
 29 September 2020: Ralph
        - DNS Flag Day 2020: change edns-buffer-size default to 1232.
 

diff --git a/testdata/doh_downstream.tdir/doh_downstream.post b/testdata/doh_downstream.tdir/doh_downstream.post
index 432e0eedd8e946998a82c52720cdf6848613d6d9..0e3c00b05531de38b44f89364dccef256165e84a 100644 (file)
--- a/testdata/doh_downstream.tdir/doh_downstream.post
+++ b/testdata/doh_downstream.tdir/doh_downstream.post
@@ -5,6 +5,8 @@
 [ -f .tpkg.var.test ] && source .tpkg.var.test
 #
 # do your teardown here
+PRE="../.."
+if grep "define HAVE_NGHTTP2 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi
 . ../common.sh
 kill_pid $FWD_PID
 kill_pid $UNBOUND_PID

diff --git a/testdata/doh_downstream.tdir/doh_downstream.pre b/testdata/doh_downstream.tdir/doh_downstream.pre
index 84734d76e8229835ff69b2f64317d367fd3737b2..29bb805a16cc66aec6af8c52ed4cae60fe196859 100644 (file)
--- a/testdata/doh_downstream.tdir/doh_downstream.pre
+++ b/testdata/doh_downstream.tdir/doh_downstream.pre
@@ -4,7 +4,10 @@
 # use .tpkg.var.test for in test variable passing
 [ -f .tpkg.var.test ] && source .tpkg.var.test
 
+PRE="../.."
 . ../common.sh
+if grep "define HAVE_NGHTTP2 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi
+
 get_random_port 2
 UNBOUND_PORT=$RND_PORT
 FWD_PORT=$(($RND_PORT + 1))
@@ -20,7 +23,6 @@ echo "FWD_PID=$FWD_PID" >> .tpkg.var.test
 # make config file
 sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$FWD_PORT'/' < doh_downstream.conf > ub.conf
 # start unbound in the background
-PRE="../.."
 $PRE/unbound -vvvv -d -c ub.conf >unbound.log 2>&1 &
 UNBOUND_PID=$!
 echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test

diff --git a/testdata/doh_downstream.tdir/doh_downstream.test b/testdata/doh_downstream.tdir/doh_downstream.test
index 78e2e84eb3c4b44ff5436548c0d5847c7087febc..d66168fbaab53c8ea2a38943db273b7415fbcef5 100644 (file)
--- a/testdata/doh_downstream.tdir/doh_downstream.test
+++ b/testdata/doh_downstream.tdir/doh_downstream.test
@@ -6,6 +6,7 @@
 
 PRE="../.."
 . ../common.sh
+if grep "define HAVE_NGHTTP2 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi
 get_make
 (cd $PRE; $MAKE dohclient)
 

diff --git a/testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.post b/testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.post
index ffad089e48c29309d44d3798487b9931cc1d5521..881970a77c0cd88e285dc52171463693c3ca40d6 100644 (file)
--- a/testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.post
+++ b/testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.post
@@ -5,6 +5,8 @@
 [ -f .tpkg.var.test ] && source .tpkg.var.test
 #
 # do your teardown here
+PRE="../.."
+if grep "define HAVE_NGHTTP2 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi
 . ../common.sh
 kill_pid $UNBOUND_PID
 cat unbound.log

diff --git a/testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.pre b/testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.pre
index 19795398c91e07a6ae731a7beebac6c690ad4ca0..a58780ab315a6b1f9630dc330f31561a5bd1aa12 100644 (file)
--- a/testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.pre
+++ b/testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.pre
@@ -4,7 +4,10 @@
 # use .tpkg.var.test for in test variable passing
 [ -f .tpkg.var.test ] && source .tpkg.var.test
 
+PRE="../.."
 . ../common.sh
+if grep "define HAVE_NGHTTP2 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi
+
 get_random_port 1
 UNBOUND_PORT=$RND_PORT
 echo "UNBOUND_PORT=$UNBOUND_PORT" >> .tpkg.var.test
@@ -12,7 +15,6 @@ echo "UNBOUND_PORT=$UNBOUND_PORT" >> .tpkg.var.test
 # make config file
 sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$FWD_PORT'/' < doh_downstream_buffer_size.conf > ub.conf
 # start unbound in the background
-PRE="../.."
 $PRE/unbound -vvvv -d -c ub.conf >unbound.log 2>&1 &
 UNBOUND_PID=$!
 echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test

diff --git a/testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.test b/testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.test
index bbeb9eb2b65faf6b72cada075e24e4548c46d8ee..78c46081d39b71f6d949891f28580c920b0eef6c 100644 (file)
--- a/testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.test
+++ b/testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.test
@@ -6,6 +6,7 @@
 
 PRE="../.."
 . ../common.sh
+if grep "define HAVE_NGHTTP2 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi
 get_make
 (cd $PRE; $MAKE dohclient)
 

diff --git a/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.post b/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.post
index ffad089e48c29309d44d3798487b9931cc1d5521..dcdf8627e076eb4e656ba2d8d7cf78f6ef29f08d 100644 (file)
--- a/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.post
+++ b/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.post
@@ -5,6 +5,8 @@
 [ -f .tpkg.var.test ] && source .tpkg.var.test
 #
 # do your teardown here
+PRE="../.."
 . ../common.sh
+if grep "define HAVE_NGHTTP2 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi
 kill_pid $UNBOUND_PID
 cat unbound.log

diff --git a/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.pre b/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.pre
index 4f10a9a18fc0242b4e22e85279a1257747b93300..cd0d11fd4b3d901cf3786704e299ec0143433839 100644 (file)
--- a/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.pre
+++ b/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.pre
@@ -4,7 +4,9 @@
 # use .tpkg.var.test for in test variable passing
 [ -f .tpkg.var.test ] && source .tpkg.var.test
 
+PRE="../.."
 . ../common.sh
+if grep "define HAVE_NGHTTP2 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi
 get_random_port 1
 UNBOUND_PORT=$RND_PORT
 echo "UNBOUND_PORT=$UNBOUND_PORT" >> .tpkg.var.test
@@ -12,7 +14,6 @@ echo "UNBOUND_PORT=$UNBOUND_PORT" >> .tpkg.var.test
 # make config file
 sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$FWD_PORT'/' < doh_downstream_endpoint.conf > ub.conf
 # start unbound in the background
-PRE="../.."
 $PRE/unbound -vvvv -d -c ub.conf >unbound.log 2>&1 &
 UNBOUND_PID=$!
 echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test

diff --git a/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.test b/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.test
index d788e366700c82191877870fd1540dd05655f246..2a6954cab6457bc75c6d333fedd4057876ee38b7 100644 (file)
--- a/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.test
+++ b/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.test
@@ -6,6 +6,7 @@
 
 PRE="../.."
 . ../common.sh
+if grep "define HAVE_NGHTTP2 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi
 get_make
 (cd $PRE; $MAKE dohclient)
 

diff --git a/testdata/doh_downstream_post.tdir/doh_downstream_post.post b/testdata/doh_downstream_post.tdir/doh_downstream_post.post
index f66183b7058106127c5495db58d0ed97f86ea69d..98034a32c439364d704065a667509c2578bbf0aa 100644 (file)
--- a/testdata/doh_downstream_post.tdir/doh_downstream_post.post
+++ b/testdata/doh_downstream_post.tdir/doh_downstream_post.post
@@ -5,7 +5,9 @@
 [ -f .tpkg.var.test ] && source .tpkg.var.test
 #
 # do your teardown here
+PRE="../.."
 . ../common.sh
+if grep "define HAVE_NGHTTP2 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi
 kill_pid $FWD_PID
 kill_pid $UNBOUND_PID
 cat unbound.log

diff --git a/testdata/doh_downstream_post.tdir/doh_downstream_post.pre b/testdata/doh_downstream_post.tdir/doh_downstream_post.pre
index e32f187c58f6058ebf570d430483659911cb6c88..34df83d4b4d25ed826c040b7cab94fb7d25742f1 100644 (file)
--- a/testdata/doh_downstream_post.tdir/doh_downstream_post.pre
+++ b/testdata/doh_downstream_post.tdir/doh_downstream_post.pre
@@ -4,7 +4,9 @@
 # use .tpkg.var.test for in test variable passing
 [ -f .tpkg.var.test ] && source .tpkg.var.test
 
+PRE="../.."
 . ../common.sh
+if grep "define HAVE_NGHTTP2 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi
 get_random_port 2
 UNBOUND_PORT=$RND_PORT
 FWD_PORT=$(($RND_PORT + 1))
@@ -20,7 +22,6 @@ echo "FWD_PID=$FWD_PID" >> .tpkg.var.test
 # make config file
 sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$FWD_PORT'/' < doh_downstream_post.conf > ub.conf
 # start unbound in the background
-PRE="../.."
 $PRE/unbound -vvvv -d -c ub.conf >unbound.log 2>&1 &
 UNBOUND_PID=$!
 echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test

diff --git a/testdata/doh_downstream_post.tdir/doh_downstream_post.test b/testdata/doh_downstream_post.tdir/doh_downstream_post.test
index d6a512ae324e8494a7cda830242eb1df91f2ee31..6442d1e1275192d3aa67233392e81ea1a7f03cba 100644 (file)
--- a/testdata/doh_downstream_post.tdir/doh_downstream_post.test
+++ b/testdata/doh_downstream_post.tdir/doh_downstream_post.test
@@ -6,6 +6,7 @@
 
 PRE="../.."
 . ../common.sh
+if grep "define HAVE_NGHTTP2 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi
 get_make
 (cd $PRE; $MAKE dohclient)