# HG changeset patch # User Jonas Hultén # Date 1727468410 -7200 # Fri Sep 27 22:20:10 2024 +0200 # Node ID e9442c2cbcdffbdffef81364651ac53676beb094 # Parent 538d4f5eabab5ba345f83a24bc81d05848dfe520 Fixed running win32 unit tests. diff --git a/jasm/unit_test.py b/jasm/unit_test.py --- a/jasm/unit_test.py +++ b/jasm/unit_test.py @@ -7,10 +7,9 @@ "Find exe to use in unit tests or return None if none was found." sources = [ - "../x64/debug-jasm/jasm.exe", - "../x64/release-jasm/jasm.exe", "bin/debug/jasm", "bin/release/jasm", + "../build/jasm/jasm.exe", "../build/jasm/jasm" ] @@ -52,8 +51,13 @@ else: processor_arguments = ["-p", processor] + if exe.endswith(".exe"): + launcher = ["wine"] + else: + launcher = [] + # construct command line - command_line = [exe] + processor_arguments + command_line_arguments + [input_path, binary_path] + command_line = launcher + [exe] + processor_arguments + command_line_arguments + [input_path, binary_path] process = subprocess.Popen(command_line, stdout=subprocess.PIPE, stderr=subprocess.PIPE) out, err = process.communicate() error_code = process.returncode