Remove redundant dependency checks for system tests

Dependencies for these tests are already checked in prereq.sh - if the
dependencies are missing, these tests will be skipped. The extra
dependency check in Makefile.am is extraneous and only applied for the
legacy test runner.

diff --git a/bin/tests/system/Makefile.am b/bin/tests/system/Makefile.am
index b1e5be1869a471f7dc33319cabc43bab31e626d1..58be57d6bedd9df4d2881ae3542763fd29a309be 100644 (file)
--- a/bin/tests/system/Makefile.am
+++ b/bin/tests/system/Makefile.am
@@ -81,11 +81,6 @@ TESTS +=             \
        rpzrecurse
 endif HAVE_PERLMOD_NET_DNS
 
-if HAVE_LIBNGHTTP2
-TESTS +=               \
-       doth
-endif
-
 TESTS +=                       \
        acl                     \
        additional              \
@@ -107,6 +102,8 @@ TESTS +=                    \
        dispatch                \
        dlzexternal             \
        dns64                   \
+       dnstap                  \
+       doth                    \
        dsdigest                \
        dyndb                   \
        ecdsa                   \
@@ -141,6 +138,7 @@ TESTS +=                    \
        notify                  \
        nsec3                   \
        nslookup                \
+       nzd2nzf                 \
        padding                 \
        pending                 \
        pipelined               \
@@ -176,10 +174,6 @@ TESTS +=                   \
        xferquota               \
        zonechecks
 
-if HAVE_LMDB
-TESTS += nzd2nzf
-endif # HAVE_LMDB
-
 if HAVE_PERLMOD_NET_DNS
 
 TESTS +=               \
@@ -192,10 +186,6 @@ TESTS +=           \
        upforwd         \
        zero
 
-if HAVE_DNSTAP
-TESTS += dnstap
-endif
-
 if HAVE_PERLMOD_FILE_FETCH
 TESTS += statschannel
 endif HAVE_PERLMOD_FILE_FETCH