From: Jason Ish <jason.ish@oisf.net>
Date: Wed, 14 Jun 2023 17:18:16 +0000 (-0700)
Subject: run.py: use suricata_bin for suricata binary
X-Git-Tag: suricata-6.0.13~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de752d26208e4f36b13c3c291af9917f64c44bc4;p=thirdparty%2Fsuricata-verify.git

run.py: use suricata_bin for suricata binary

suricata_bin is set correctly on startup for Windows or Linux. Fixes
running suricata-verify on certain Windows environments.
---

diff --git a/run.py b/run.py
index 67d45533a..af79c1360 100755
--- a/run.py
+++ b/run.py
@@ -48,9 +48,14 @@ import traceback
 VALIDATE_EVE = False
 WIN32 = sys.platform == "win32"
 LINUX = sys.platform.startswith("linux")
-suricata_bin = "src\suricata.exe" if WIN32 else "./src/suricata"
 suricata_yaml = "suricata.yaml" if WIN32 else "./suricata.yaml"
 
+# Determine the Suricata binary
+if os.path.exists("src\suricata.exe"):
+    suricata_bin = "src\suricata.exe"
+else:
+    suricata_bin = "./src/suricata"
+
 PROC_TIMEOUT=300
 
 if LINUX:
@@ -849,7 +854,7 @@ class TestRunner:
             args += [ "valgrind", "-v", "--error-exitcode=255", suppression_opt ]
 
         args += [
-            os.path.join(self.cwd, "src/suricata"),
+            os.path.join(self.cwd, suricata_bin),
         ]
 
         # Load args from config file.