From 2b219e3704acdc344468b5835e31260f62c1914f Mon Sep 17 00:00:00 2001 From: Otto Date: Mon, 8 Nov 2021 11:28:34 +0100 Subject: [PATCH] Review remarks from Habbie --- regression-tests.recursor-dnssec/runtests | 2 +- regression-tests/recursor-test | 16 ++++++++-------- tasks.py | 14 +++++++------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/regression-tests.recursor-dnssec/runtests b/regression-tests.recursor-dnssec/runtests index df3a4fb3c1..600d681adf 100755 --- a/regression-tests.recursor-dnssec/runtests +++ b/regression-tests.recursor-dnssec/runtests @@ -55,7 +55,7 @@ if ! "$PDNSRECURSOR" --version 2>&1 | grep Features | grep -q dnstap-framestream export NODNSTAPTESTS=1 fi -# libfstrm has a bad interaction with libfaketime on at leas Ubuntu focal +# libfstrm has a bad interaction with libfaketime on at least Ubuntu Focal. # to run the test without LIBFAKETIME, we clear the var if it set to /bin/false if [ "$LIBFAKETIME" = "/bin/false" ]; then LIBFAKETIME="" diff --git a/regression-tests/recursor-test b/regression-tests/recursor-test index 4523fb9c5d..abf63f40bb 100755 --- a/regression-tests/recursor-test +++ b/regression-tests/recursor-test @@ -19,9 +19,9 @@ shards=$5 if [ $IPv6 = 1 ] then - QLA6=" ::" + QLA6=" ::" else - QLA6="" + QLA6="" fi rm -f recursor.pid pdns_recursor.pid @@ -35,8 +35,8 @@ rm -f recursor.pid pdns_recursor.pid sleep 3 if [ ! -e pdns_recursor.pid ]; then cat recursor.log - echo Recursor did not start or did not write pdns_recursor.pid, exiting - exit 1 + echo Recursor did not start or did not write pdns_recursor.pid, exiting + exit 1 fi @@ -84,11 +84,11 @@ ANANSWER=$[(100*(${DBT_QUEUED}-${DBT_ERRORS}-${DBT_TIMEOUTS}) )/${DBT_QUEUED}] if [ "$ANANSWER" -ge $THRESHOLD ] then - echo recursor-bulktest >> passed_tests - RETVAL=0 + echo recursor-bulktest >> passed_tests + RETVAL=0 else - echo recursor-bulktest >> failed_tests - RETVAL=1 + echo recursor-bulktest >> failed_tests + RETVAL=1 fi echo "$DBT_OKPERCENTAGE% of domains resolved" > recursor-bulktest/diff diff --git a/tasks.py b/tasks.py index 5350513943..d01735e213 100644 --- a/tasks.py +++ b/tasks.py @@ -53,17 +53,17 @@ rec_build_deps = [ ] rec_bulk_deps = [ 'curl', - 'unzip', - 'moreutils', - 'pdns-tools', - 'libluajit-5.1-2', 'libboost-all-dev', 'libcap2', + 'libfstrm0', + 'libluajit-5.1-2', + 'libsnmp35', + 'libsodium23', 'libssl1.1', 'libsystemd0', - 'libsodium23', - 'libfstrm0', - 'libsnmp35' + 'moreutils', + 'pdns-tools', + 'unzip' ] dnsdist_build_deps = [ 'libcap-dev', -- 2.39.5