upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix doh tests when not compiled in.

Browse source
This commit is contained in:
W.C.A. Wijngaards 2020-09-30 11:20:33 +02:00
parent b6d04f500b
commit a7ae0ade66
13 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/Changelog
View file

@ -1,3 +1,6 @@
30 September 2020: Wouter
- Fix doh tests when not compiled in.
29 September 2020: Ralph 29 September 2020: Ralph
- DNS Flag Day 2020: change edns-buffer-size default to 1232. - DNS Flag Day 2020: change edns-buffer-size default to 1232.

2
testdata/doh_downstream.tdir/doh_downstream.post vendored
View file

@ -5,6 +5,8 @@
[ -f .tpkg.var.test ] && source .tpkg.var.test [ -f .tpkg.var.test ] && source .tpkg.var.test
# #
# do your teardown here # 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 . ../common.sh
kill_pid $FWD_PID kill_pid $FWD_PID
kill_pid $UNBOUND_PID kill_pid $UNBOUND_PID

4
testdata/doh_downstream.tdir/doh_downstream.pre vendored
View file

@ -4,7 +4,10 @@
# use .tpkg.var.test for in test variable passing # use .tpkg.var.test for in test variable passing
[ -f .tpkg.var.test ] && source .tpkg.var.test [ -f .tpkg.var.test ] && source .tpkg.var.test
PRE="../.."
. ../common.sh . ../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 get_random_port 2
UNBOUND_PORT=$RND_PORT UNBOUND_PORT=$RND_PORT
FWD_PORT=$(($RND_PORT + 1)) FWD_PORT=$(($RND_PORT + 1))
@ -20,7 +23,6 @@ echo "FWD_PID=$FWD_PID" >> .tpkg.var.test
# make config file # make config file
sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$FWD_PORT'/' < doh_downstream.conf > ub.conf sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$FWD_PORT'/' < doh_downstream.conf > ub.conf
# start unbound in the background # start unbound in the background
PRE="../.."
$PRE/unbound -vvvv -d -c ub.conf >unbound.log 2>&1 & $PRE/unbound -vvvv -d -c ub.conf >unbound.log 2>&1 &
UNBOUND_PID=$! UNBOUND_PID=$!
echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test

1
testdata/doh_downstream.tdir/doh_downstream.test vendored
View file

@ -6,6 +6,7 @@
PRE="../.." PRE="../.."
. ../common.sh . ../common.sh
if grep "define HAVE_NGHTTP2 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi
get_make get_make
(cd $PRE; $MAKE dohclient) (cd $PRE; $MAKE dohclient)

2
testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.post vendored
View file

@ -5,6 +5,8 @@
[ -f .tpkg.var.test ] && source .tpkg.var.test [ -f .tpkg.var.test ] && source .tpkg.var.test
# #
# do your teardown here # 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 . ../common.sh
kill_pid $UNBOUND_PID kill_pid $UNBOUND_PID
cat unbound.log cat unbound.log

4
testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.pre vendored
View file

@ -4,7 +4,10 @@
# use .tpkg.var.test for in test variable passing # use .tpkg.var.test for in test variable passing
[ -f .tpkg.var.test ] && source .tpkg.var.test [ -f .tpkg.var.test ] && source .tpkg.var.test
PRE="../.."
. ../common.sh . ../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 get_random_port 1
UNBOUND_PORT=$RND_PORT UNBOUND_PORT=$RND_PORT
echo "UNBOUND_PORT=$UNBOUND_PORT" >> .tpkg.var.test echo "UNBOUND_PORT=$UNBOUND_PORT" >> .tpkg.var.test
@ -12,7 +15,6 @@ echo "UNBOUND_PORT=$UNBOUND_PORT" >> .tpkg.var.test
# make config file # make config file
sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$FWD_PORT'/' < doh_downstream_buffer_size.conf > ub.conf sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$FWD_PORT'/' < doh_downstream_buffer_size.conf > ub.conf
# start unbound in the background # start unbound in the background
PRE="../.."
$PRE/unbound -vvvv -d -c ub.conf >unbound.log 2>&1 & $PRE/unbound -vvvv -d -c ub.conf >unbound.log 2>&1 &
UNBOUND_PID=$! UNBOUND_PID=$!
echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test

1
testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.test vendored
View file

@ -6,6 +6,7 @@
PRE="../.." PRE="../.."
. ../common.sh . ../common.sh
if grep "define HAVE_NGHTTP2 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi
get_make get_make
(cd $PRE; $MAKE dohclient) (cd $PRE; $MAKE dohclient)

2
testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.post vendored
View file

@ -5,6 +5,8 @@
[ -f .tpkg.var.test ] && source .tpkg.var.test [ -f .tpkg.var.test ] && source .tpkg.var.test
# #
# do your teardown here # do your teardown here
PRE="../.."
. ../common.sh . ../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 kill_pid $UNBOUND_PID
cat unbound.log cat unbound.log

3
testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.pre vendored
View file

@ -4,7 +4,9 @@
# use .tpkg.var.test for in test variable passing # use .tpkg.var.test for in test variable passing
[ -f .tpkg.var.test ] && source .tpkg.var.test [ -f .tpkg.var.test ] && source .tpkg.var.test
PRE="../.."
. ../common.sh . ../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 get_random_port 1
UNBOUND_PORT=$RND_PORT UNBOUND_PORT=$RND_PORT
echo "UNBOUND_PORT=$UNBOUND_PORT" >> .tpkg.var.test echo "UNBOUND_PORT=$UNBOUND_PORT" >> .tpkg.var.test
@ -12,7 +14,6 @@ echo "UNBOUND_PORT=$UNBOUND_PORT" >> .tpkg.var.test
# make config file # make config file
sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$FWD_PORT'/' < doh_downstream_endpoint.conf > ub.conf sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$FWD_PORT'/' < doh_downstream_endpoint.conf > ub.conf
# start unbound in the background # start unbound in the background
PRE="../.."
$PRE/unbound -vvvv -d -c ub.conf >unbound.log 2>&1 & $PRE/unbound -vvvv -d -c ub.conf >unbound.log 2>&1 &
UNBOUND_PID=$! UNBOUND_PID=$!
echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test

1
testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.test vendored
View file

@ -6,6 +6,7 @@
PRE="../.." PRE="../.."
. ../common.sh . ../common.sh
if grep "define HAVE_NGHTTP2 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi
get_make get_make
(cd $PRE; $MAKE dohclient) (cd $PRE; $MAKE dohclient)

2
testdata/doh_downstream_post.tdir/doh_downstream_post.post vendored
View file

@ -5,7 +5,9 @@
[ -f .tpkg.var.test ] && source .tpkg.var.test [ -f .tpkg.var.test ] && source .tpkg.var.test
# #
# do your teardown here # do your teardown here
PRE="../.."
. ../common.sh . ../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 $FWD_PID
kill_pid $UNBOUND_PID kill_pid $UNBOUND_PID
cat unbound.log cat unbound.log

3
testdata/doh_downstream_post.tdir/doh_downstream_post.pre vendored
View file

@ -4,7 +4,9 @@
# use .tpkg.var.test for in test variable passing # use .tpkg.var.test for in test variable passing
[ -f .tpkg.var.test ] && source .tpkg.var.test [ -f .tpkg.var.test ] && source .tpkg.var.test
PRE="../.."
. ../common.sh . ../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 get_random_port 2
UNBOUND_PORT=$RND_PORT UNBOUND_PORT=$RND_PORT
FWD_PORT=$(($RND_PORT + 1)) FWD_PORT=$(($RND_PORT + 1))
@ -20,7 +22,6 @@ echo "FWD_PID=$FWD_PID" >> .tpkg.var.test
# make config file # make config file
sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$FWD_PORT'/' < doh_downstream_post.conf > ub.conf sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$FWD_PORT'/' < doh_downstream_post.conf > ub.conf
# start unbound in the background # start unbound in the background
PRE="../.."
$PRE/unbound -vvvv -d -c ub.conf >unbound.log 2>&1 & $PRE/unbound -vvvv -d -c ub.conf >unbound.log 2>&1 &
UNBOUND_PID=$! UNBOUND_PID=$!
echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test

1
testdata/doh_downstream_post.tdir/doh_downstream_post.test vendored
View file

@ -6,6 +6,7 @@
PRE="../.." PRE="../.."
. ../common.sh . ../common.sh
if grep "define HAVE_NGHTTP2 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi
get_make get_make
(cd $PRE; $MAKE dohclient) (cd $PRE; $MAKE dohclient)