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 56ea9b0d57173b93569d9c72c9b1372ce9234d13..9051dd8146d73307bfeff1aa201efb069654e8de 100644 (file)
--- 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 56ea9b0d57173b93569d9c72c9b1372ce9234d13..d1d27987583eba191b226b2f514f1c58820f2fc7 100644 (file)
--- 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 56ea9b0d57173b93569d9c72c9b1372ce9234d13..d1d27987583eba191b226b2f514f1c58820f2fc7 100644 (file)
--- 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 56ea9b0d57173b93569d9c72c9b1372ce9234d13..9051dd8146d73307bfeff1aa201efb069654e8de 100644 (file)
--- 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 56ea9b0d57173b93569d9c72c9b1372ce9234d13..9051dd8146d73307bfeff1aa201efb069654e8de 100644 (file)
--- 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 56ea9b0d57173b93569d9c72c9b1372ce9234d13..9051dd8146d73307bfeff1aa201efb069654e8de 100644 (file)
--- 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 56ea9b0d57173b93569d9c72c9b1372ce9234d13..9051dd8146d73307bfeff1aa201efb069654e8de 100644 (file)
--- 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 56ea9b0d57173b93569d9c72c9b1372ce9234d13..9051dd8146d73307bfeff1aa201efb069654e8de 100644 (file)
--- 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 56ea9b0d57173b93569d9c72c9b1372ce9234d13..9051dd8146d73307bfeff1aa201efb069654e8de 100644 (file)
--- 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 be9aebb5bddd0fa88ba85d09d3fb7cef6d6df182..982b04d04e88f85f3c3e03ab2d87d37b8592d8bf 100644 (file)
--- 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 42bd1a0a316038759afe61ef88e3aa2c4741aea3..6ed696750028a9bf0c7a3a765b5de0bda050c34d 100644 (file)
--- 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 c1bdf627340b0b499ab2ac29021b422737b5639f..bfeedf9feea6db918cebbc736e2daca8c05c2cff 100644 (file)
--- 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 56ea9b0d57173b93569d9c72c9b1372ce9234d13..9051dd8146d73307bfeff1aa201efb069654e8de 100644 (file)
--- 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 8b832e46d6e9da3ceb0058e4922dac5bffb1111e..6efb97ba1e5380e1f1de051ce8af54e2f5e17458 100644 (file)
--- 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 56ea9b0d57173b93569d9c72c9b1372ce9234d13..1fae0c7db831c44513d9f9af45615ee90050102e 100644 (file)
--- 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 8914068e2ee8ba0b23effdb0c77cb70ca184ade2..82a17ddffd3bf74941e4a56892ba41f4fc2bd77e 100644 (file)
--- 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