Commit a29be2a6 authored by premathasara's avatar premathasara
Browse files

Merge branch... 

Merge branch '267-pytest-can-now-use-the-linux-binary-of-networksimulator_g192-native-rather-than-via-wine' into 'main'

Remove the use of wine in test_param_file when calling networkSimulator_g192...

See merge request !365
parents c2fd9dcb c7af5187

scripts/tools/Linux/networkSimulator_g192

100644 → 100755
(87.7 KiB)

File mode changed from 100644 to 100755.

View file

tests/test_param_file.py

+4 −8
Original line number Diff line number Diff line
@@ -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