From: Victor Julien Date: Tue, 24 Mar 2020 06:35:44 +0000 (+0100) Subject: windows: skip shell checks and don't run setup X-Git-Tag: suricata-6.0.4~323 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c233f3c8d60b9da373085967b8c14d363246a68;p=thirdparty%2Fsuricata-verify.git windows: skip shell checks and don't run setup --- diff --git a/run.py b/run.py index 002d1ad21..24f715882 100755 --- 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