add requires check to lua tests

remove check based on directory name

diff --git a/run.py b/run.py
index d210d7f9ac967fb8a0b38ac17deb20d66901e66d..d120c5b343d65d2a3b166ec5f9f3f8a8804aef23 100755 (executable)
--- a/run.py
+++ b/run.py
@@ -219,6 +219,9 @@ class FilterCheck:
                     count += 1
         if count == self.config["count"]:
             return True
+        if self.config["comment"]:
+            raise Exception("%s: expected %d, got %d" % (
+                self.config["comment"], self.config["count"], count))
         raise Exception("expected %d matches; got %d for filter %s" % (
             self.config["count"], count, str(self.config)))
 
@@ -260,12 +263,6 @@ class TestRunner:
 
         test_config.check_requires()
 
-        # Additional requirement checks.
-        # - If lua is in the test name, make sure we HAVE_LUA.
-        if self.directory.find("lua"):
-            if not self.suricata_config.has_feature("HAVE_LUA"):
-                raise UnsatisfiedRequirementError("requires feature HAVE_LUA")
-
         shell = False
 
         if test_config.has_command():

diff --git a/tests/lua-output-http/test.yaml b/tests/lua-output-http/test.yaml
new file mode 100644 (file)
index 0000000..4bb475d
--- /dev/null
+++ b/tests/lua-output-http/test.yaml
@@ -0,0 +1,3 @@
+requires:
+  features:
+    - HAVE_LUA

diff --git a/tests/lua-output-smtp/test.yaml b/tests/lua-output-smtp/test.yaml
new file mode 100644 (file)
index 0000000..4bb475d
--- /dev/null
+++ b/tests/lua-output-smtp/test.yaml
@@ -0,0 +1,3 @@
+requires:
+  features:
+    - HAVE_LUA