runner: prevent double output directory

diff --git a/run.py b/run.py
index 227688689095bc52865fb945e339dea6e27e7884..52728c23ae9dd00e4f615fb554c6cc47b365510b 100755 (executable)
--- 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)