From: Jason Ish <ish@unx.ca>
Date: Mon, 22 Jan 2018 13:34:50 +0000 (-0600)
Subject: runner: prevent double output directory
X-Git-Tag: suricata-6.0.4~511
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8cd73dd87f5f0efd2f3375ecb3a637ec940e635;p=thirdparty%2Fsuricata-verify.git

runner: prevent double output directory
---

diff --git a/run.py b/run.py
index 227688689..52728c23a 100755
--- a/run.py
+++ b/run.py
@@ -213,7 +213,7 @@ class TestRunner:
         self.directory = directory
         self.suricata_config = suricata_config
         self.verbose = verbose
-        self.output = os.path.join(outdir, "output")
+        self.output = outdir
 
         # The name is just the directory name.
         self.name = os.path.basename(self.directory)
@@ -572,7 +572,7 @@ def main():
 
         outdir = os.path.join(dirpath, "output")
         if args.outdir:
-            outdir = os.path.join(os.path.realpath(args.outdir), name)
+            outdir = os.path.join(os.path.realpath(args.outdir), name, "output")
 
         test_runner = TestRunner(
             cwd, dirpath, outdir, suricata_config, args.verbose)