laforge submitted this change.

View Change

testenv: fix testsuite.run() not passing env variables

Running start-testsuite.sh in a clean env fails on systems with non-
standard TTCN3_BIN_DIR and TITAN_LIBRARY_PATH paths.  This is the
case for Arch Linux and the eclipse-titan AUR package.  Let's call
cmd.generate_env() to allow overriding these variables.

Change-Id: I95c3cfe41ee230927bb5777631372597cbd3c051
---
M _testenv/testenv/testsuite.py
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/_testenv/testenv/testsuite.py b/_testenv/testenv/testsuite.py
index 88ea467..077d3f1 100644
--- a/_testenv/testenv/testsuite.py
+++ b/_testenv/testenv/testsuite.py
@@ -162,9 +162,8 @@
     start_testsuite = os.path.join(ttcn3_hacks_dir, "start-testsuite.sh")
     suite = os.path.join(ttcn3_hacks_dir, testenv.args.testsuite, section_data["program"])
 
-    env = {
-        "TTCN3_PCAP_PATH": os.path.join(testenv.testdir.testdir, "testsuite"),
-    }
+    pcap_path = os.path.join(testenv.testdir.testdir, "testsuite")
+    env = testenv.cmd.generate_env({ "TTCN3_PCAP_PATH" : pcap_path })
 
     cmd = [start_testsuite, suite, section_data["config"]]
 

To view, visit change 37933. To unsubscribe, or for help writing mail filters, visit settings.