From: Jason Ish <jason.ish@oisf.net>
Date: Thu, 11 Feb 2021 17:27:50 +0000 (-0600)
Subject: parallel runs: don't initialize MP at all on non-linux
X-Git-Tag: suricata-6.0.4~152
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b09c3573b24836b22e1e3697f10efb8b94e8b52;p=thirdparty%2Fsuricata-verify.git

parallel runs: don't initialize MP at all on non-linux

On Windows, simply initializing seems to fail.
---

diff --git a/run.py b/run.py
index af7e21189..1f7936b20 100755
--- a/run.py
+++ b/run.py
@@ -39,6 +39,7 @@ import json
 import unittest
 import multiprocessing as mp
 from collections import namedtuple
+import threading
 
 import yaml
 
@@ -47,11 +48,18 @@ LINUX = sys.platform.startswith("linux")
 suricata_bin = "src\suricata.exe" if WIN32 else "./src/suricata"
 suricata_yaml = "suricata.yaml" if WIN32 else "./suricata.yaml"
 
-manager = mp.Manager()
-lock = mp.Lock()
-failedLogs = manager.list()
-count_dict = manager.dict()
-check_args = manager.dict()
+if LINUX:
+    manager = mp.Manager()
+    lock = mp.Lock()
+    failedLogs = manager.list()
+    count_dict = manager.dict()
+    check_args = manager.dict()
+else:
+    count_dict = {}
+    check_args = {}
+    # Bring in a lock from threading to satisfy the MP semantics when
+    # not using MP.
+    lock = threading.Lock()
 
 count_dict['passed'] = 0
 count_dict['failed'] = 0