From: Philippe Antoine <contact@catenacyber.fr>
Date: Fri, 22 Oct 2021 10:16:42 +0000 (+0200)
Subject: framework: allow to use env variables in args
X-Git-Tag: suricata-6.0.4~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=973b2217dd3b79189ef6de2b7cba509292fa4565;p=thirdparty%2Fsuricata-verify.git

framework: allow to use env variables in args

such as OUTPUT_DIR for datasets
---

diff --git a/run.py b/run.py
index 3b7ae08cc..a6739b089 100755
--- a/run.py
+++ b/run.py
@@ -625,6 +625,8 @@ class TestRunner:
                 template = string.Template(args)
                 cmdline = template.substitute(env)
             else:
+                for a in range(len(args)):
+                    args[a] = string.Template(args[a]).substitute(env)
                 cmdline = " ".join(args) + "\n"
 
             open(os.path.join(self.output, "cmdline"), "w").write(cmdline)
diff --git a/tests/datasets-pcrexform/test.yaml b/tests/datasets-pcrexform/test.yaml
index 5e4560f13..28966a641 100644
--- a/tests/datasets-pcrexform/test.yaml
+++ b/tests/datasets-pcrexform/test.yaml
@@ -6,7 +6,7 @@ requires:
     - src/datasets.c
 
 args:
- - -k none --data-dir=output
+ - -k none --data-dir=${OUTPUT_DIR}
 
 checks:
   - file-compare: