From c7af5187af53ced1af7db15d0c4bcc154f4b96be Mon Sep 17 00:00:00 2001 From: Shanush Prema Thasarathan Date: Tue, 3 Jan 2023 14:53:43 +1100 Subject: [PATCH] Remove the use of wine in test_param_file when calling networkSimulator_g192 on linux. Use linux binary instead --- scripts/tools/Linux/networkSimulator_g192 | Bin tests/test_param_file.py | 12 ++++-------- 2 files changed, 4 insertions(+), 8 deletions(-) mode change 100644 => 100755 scripts/tools/Linux/networkSimulator_g192 diff --git a/scripts/tools/Linux/networkSimulator_g192 b/scripts/tools/Linux/networkSimulator_g192 old mode 100644 new mode 100755 diff --git a/tests/test_param_file.py b/tests/test_param_file.py index 730acd5c00..4031fd36bf 100644 --- a/tests/test_param_file.py +++ b/tests/test_param_file.py @@ -356,14 +356,10 @@ def simulate( if platform.system() == "Windows": netsim = [os.path.join(rootdir, "scripts", "tools", "Win32", "networkSimulator_g192.exe")] - elif platform.system() == "Linux": - # there is no Linux binary available -> use the Win32 binary via wine - netsim = [ - "wine", - os.path.join(rootdir, "scripts", "tools", "Win32", "networkSimulator_g192.exe"), - ] - elif platform.system() == "Darwin": - netsim = [os.path.join(rootdir, "scripts", "tools", "Darwin", "networkSimulator_g192")] + elif platform.system() in ["Linux", "Darwin"]: + netsim = [os.path.join(rootdir, "scripts", "tools", platform.system(), "networkSimulator_g192")] + else: + assert False, f"networkSimulator_g192 not available for {platform.system()}" if update_ref == 1 or update_ref == 2 and not os.path.exists(ref_out_file): # call network simulator on REF encoder output -- GitLab