]> git.ipfire.org Git - thirdparty/suricata-verify.git/commitdiff
windows: skip shell checks and don't run setup 203/head
authorVictor Julien <victor@inliniac.net>
Tue, 24 Mar 2020 06:35:44 +0000 (07:35 +0100)
committerVictor Julien <victor@inliniac.net>
Tue, 24 Mar 2020 06:51:16 +0000 (07:51 +0100)
run.py

diff --git a/run.py b/run.py
index 002d1ad212f1e1cbd018f7beff32515da8bb8ec6..24f7158823c35a8d5a3c3c8b409759210fb3af5c 100755 (executable)
--- a/run.py
+++ b/run.py
@@ -273,6 +273,9 @@ class ShellCheck:
         if not self.config or "args" not in self.config:
             raise TestError("shell check missing args")
         try:
+            if WIN32:
+                print("skipping shell check on windows")
+                return True;
             output = subprocess.check_output(self.config["args"], shell=True)
             if "expect" in self.config:
                 return str(self.config["expect"]) == output.decode().strip()
@@ -522,6 +525,8 @@ class TestRunner:
 
         if WIN32 and os.path.exists(os.path.join(self.directory, "check.sh")):
             raise UnsatisfiedRequirementError("check.sh tests are not supported on Windows")
+        if WIN32 and "setup" in self.config:
+            raise UnsatisfiedRequirementError("test \"setup\" not supported on Windows")
 
         shell = False