From: Jason Ish Date: Wed, 14 Mar 2018 17:26:38 +0000 (-0600) Subject: skip many dns tests when rust is enabled... X-Git-Tag: suricata-6.0.4~492 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8ece3d22a9ea584437014097dd9d5daa3265b67;p=thirdparty%2Fsuricata-verify.git skip many dns tests when rust is enabled... they depend on dns v1 logging, which is not supported by rust builds --- diff --git a/tests/dns-json-log/test.yaml b/tests/dns-json-log/test.yaml index 56ea9b0d5..9051dd814 100644 --- a/tests/dns-json-log/test.yaml +++ b/tests/dns-json-log/test.yaml @@ -1,3 +1,7 @@ requires: features: - HAVE_LIBJANSSON + +skip: + - feature: RUST + msg: eve dns v1 not supported by rust diff --git a/tests/dns-tcp-multirequest-buffer-1/test.yaml b/tests/dns-tcp-multirequest-buffer-1/test.yaml index 56ea9b0d5..d1d279875 100644 --- a/tests/dns-tcp-multirequest-buffer-1/test.yaml +++ b/tests/dns-tcp-multirequest-buffer-1/test.yaml @@ -1,3 +1,8 @@ requires: features: - HAVE_LIBJANSSON + +skip: + - feature: RUST + msg: eve dns v1 not supported by rust + diff --git a/tests/dns-tcp-www-google-com/test.yaml b/tests/dns-tcp-www-google-com/test.yaml index 56ea9b0d5..d1d279875 100644 --- a/tests/dns-tcp-www-google-com/test.yaml +++ b/tests/dns-tcp-www-google-com/test.yaml @@ -1,3 +1,8 @@ requires: features: - HAVE_LIBJANSSON + +skip: + - feature: RUST + msg: eve dns v1 not supported by rust + diff --git a/tests/dns-udp-double-request-response/test.yaml b/tests/dns-udp-double-request-response/test.yaml index 56ea9b0d5..9051dd814 100644 --- a/tests/dns-udp-double-request-response/test.yaml +++ b/tests/dns-udp-double-request-response/test.yaml @@ -1,3 +1,7 @@ requires: features: - HAVE_LIBJANSSON + +skip: + - feature: RUST + msg: eve dns v1 not supported by rust diff --git a/tests/dns-udp-eve-log-aaaa-only/test.yaml b/tests/dns-udp-eve-log-aaaa-only/test.yaml index 56ea9b0d5..9051dd814 100644 --- a/tests/dns-udp-eve-log-aaaa-only/test.yaml +++ b/tests/dns-udp-eve-log-aaaa-only/test.yaml @@ -1,3 +1,7 @@ requires: features: - HAVE_LIBJANSSON + +skip: + - feature: RUST + msg: eve dns v1 not supported by rust diff --git a/tests/dns-udp-eve-log-answer-only/test.yaml b/tests/dns-udp-eve-log-answer-only/test.yaml index 56ea9b0d5..9051dd814 100644 --- a/tests/dns-udp-eve-log-answer-only/test.yaml +++ b/tests/dns-udp-eve-log-answer-only/test.yaml @@ -1,3 +1,7 @@ requires: features: - HAVE_LIBJANSSON + +skip: + - feature: RUST + msg: eve dns v1 not supported by rust diff --git a/tests/dns-udp-eve-log-mx-only/test.yaml b/tests/dns-udp-eve-log-mx-only/test.yaml index 56ea9b0d5..9051dd814 100644 --- a/tests/dns-udp-eve-log-mx-only/test.yaml +++ b/tests/dns-udp-eve-log-mx-only/test.yaml @@ -1,3 +1,7 @@ requires: features: - HAVE_LIBJANSSON + +skip: + - feature: RUST + msg: eve dns v1 not supported by rust diff --git a/tests/dns-udp-eve-log-query-only/test.yaml b/tests/dns-udp-eve-log-query-only/test.yaml index 56ea9b0d5..9051dd814 100644 --- a/tests/dns-udp-eve-log-query-only/test.yaml +++ b/tests/dns-udp-eve-log-query-only/test.yaml @@ -1,3 +1,7 @@ requires: features: - HAVE_LIBJANSSON + +skip: + - feature: RUST + msg: eve dns v1 not supported by rust diff --git a/tests/dns-udp-nxdomain-soa/test.yaml b/tests/dns-udp-nxdomain-soa/test.yaml index 56ea9b0d5..9051dd814 100644 --- a/tests/dns-udp-nxdomain-soa/test.yaml +++ b/tests/dns-udp-nxdomain-soa/test.yaml @@ -1,3 +1,7 @@ requires: features: - HAVE_LIBJANSSON + +skip: + - feature: RUST + msg: eve dns v1 not supported by rust diff --git a/tests/eve-alert-metadata-defaults/test.yaml b/tests/eve-alert-metadata-defaults/test.yaml index be9aebb5b..982b04d04 100644 --- a/tests/eve-alert-metadata-defaults/test.yaml +++ b/tests/eve-alert-metadata-defaults/test.yaml @@ -3,6 +3,10 @@ requires: script: - grep METADATA_DEFAULTS src/output-json-alert.c > /dev/null +skip: + - feature: RUST + msg: eve dns v1 not supported by rust + checks: - filter: diff --git a/tests/eve-alert-metadata-enable-rule/test.yaml b/tests/eve-alert-metadata-enable-rule/test.yaml index 42bd1a0a3..6ed696750 100644 --- a/tests/eve-alert-metadata-enable-rule/test.yaml +++ b/tests/eve-alert-metadata-enable-rule/test.yaml @@ -3,6 +3,10 @@ requires: script: - grep METADATA_DEFAULTS src/output-json-alert.c > /dev/null +skip: + - feature: RUST + msg: eve dns v1 not supported by rust + checks: - filter: diff --git a/tests/eve-alert-metadata-off/test.yaml b/tests/eve-alert-metadata-off/test.yaml index c1bdf6273..bfeedf9fe 100644 --- a/tests/eve-alert-metadata-off/test.yaml +++ b/tests/eve-alert-metadata-off/test.yaml @@ -3,6 +3,10 @@ requires: script: - grep METADATA_DEFAULTS src/output-json-alert.c > /dev/null +skip: + - feature: RUST + msg: eve dns v1 not supported by rust + checks: - filter: diff --git a/tests/eve-dns/test.yaml b/tests/eve-dns/test.yaml index 56ea9b0d5..9051dd814 100644 --- a/tests/eve-dns/test.yaml +++ b/tests/eve-dns/test.yaml @@ -1,3 +1,7 @@ requires: features: - HAVE_LIBJANSSON + +skip: + - feature: RUST + msg: eve dns v1 not supported by rust diff --git a/tests/eve-metadata/test.yaml b/tests/eve-metadata/test.yaml index 8b832e46d..6efb97ba1 100644 --- a/tests/eve-metadata/test.yaml +++ b/tests/eve-metadata/test.yaml @@ -5,6 +5,10 @@ requires: script: - grep JsonAddMetadata src/output-json.h > /dev/null +skip: + - feature: RUST + msg: eve dns v1 not supported by rust + checks: - filter: diff --git a/tests/single-dns-request/test.yaml b/tests/single-dns-request/test.yaml index 56ea9b0d5..1fae0c7db 100644 --- a/tests/single-dns-request/test.yaml +++ b/tests/single-dns-request/test.yaml @@ -1,3 +1,6 @@ requires: features: - HAVE_LIBJANSSON +skip: + - feature: RUST + msg: eve dns v1 not supported by rust diff --git a/tests/test-config-empty-rule-file/suricata.yaml b/tests/test-config-empty-rule-file/suricata.yaml index 8914068e2..82a17ddff 100644 --- a/tests/test-config-empty-rule-file/suricata.yaml +++ b/tests/test-config-empty-rule-file/suricata.yaml @@ -3,5 +3,8 @@ include: ../../etc/suricata-3.1.2.yaml +# Redefine outputs so eve/dns v1 isn't picked up by default. +outputs: + rule-files: - empty.rules