allow optional reason for skip in non-features

diff --git a/README.md b/README.md
index 1ce47a0d10f5b791f1ddf9d8123351bcdc19da9d..3d8fa7a1245682088500a47a66e40360056405e9 100644 (file)
--- a/README.md
+++ b/README.md
@@ -62,4 +62,4 @@ requires:
 
   # Require that Suricata not be built with specific features.
   not-features:
-    - RUST
+    RUST: option reason

diff --git a/run.py b/run.py
index bd85ece4bee0655ded854b84e162529bd3f128d1..8a1dec31861920777665b96004987c5f97982879 100755 (executable)
--- a/run.py
+++ b/run.py
@@ -102,8 +102,12 @@ class TestConfig:
             if "not-features" in requires:
                 for feature in requires["not-features"]:
                     if self.suricata_config.has_feature(feature):
-                        raise UnsatisfiedRequirementError(
-                            "not for feature %s" % (feature))
+                        if requires["not-features"][feature]:
+                            comment = "%s" % (
+                                requires["not-features"][feature])
+                        else:
+                            comment = "not for feature %s" % (feature)
+                        raise UnsatisfiedRequirementError(comment)
 
             if "env" in requires:
                 for env in requires["env"]:

diff --git a/tests/dns-lua-rules/test.yaml b/tests/dns-lua-rules/test.yaml
index c76354aab54323f83aeeab54cf6945f0b9ff6fbf..79ff97513a1fc0b927b137ee9b3a7ebdca85086d 100644 (file)
--- a/tests/dns-lua-rules/test.yaml
+++ b/tests/dns-lua-rules/test.yaml
@@ -2,7 +2,7 @@ requires:
   features:
     - HAVE_LUA
   not-features:
-    - RUST
+    RUST: known issue with feature RUST
 
 checks:
   - filter:

diff --git a/tests/dns-udp-dns-log-unanswered/test.yaml b/tests/dns-udp-dns-log-unanswered/test.yaml
index dfbdcfb53d4dde1f2fc92b730f9657914a4b7f54..d00be748594df553058087a58398d1726ec2fad3 100644 (file)
--- a/tests/dns-udp-dns-log-unanswered/test.yaml
+++ b/tests/dns-udp-dns-log-unanswered/test.yaml
@@ -1,4 +1,4 @@
 requires:
   # Test will be skipped if any of these features are present.
   not-features:
-    - RUST
+    RUST:

diff --git a/tests/dns-udp-unsolicited-response/test.yaml b/tests/dns-udp-unsolicited-response/test.yaml
index 6aec7b1ab322a593609b360ec040c80c3f9351d8..0546b5b1e3e3ffd48714e6c7bcd58a18d0c6c546 100644 (file)
--- a/tests/dns-udp-unsolicited-response/test.yaml
+++ b/tests/dns-udp-unsolicited-response/test.yaml
@@ -1,6 +1,6 @@
 requires:
   # Test will be skipped if any of these features are present.
   not-features:
-    - RUST
+    RUST:
   features:
     - HAVE_LIBJANSSON