diff options
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test/dotest.py')
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/dotest.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/dotest.py b/lldb/packages/Python/lldbsuite/test/dotest.py index 9991a33ae86..4c19a2a2eb9 100644 --- a/lldb/packages/Python/lldbsuite/test/dotest.py +++ b/lldb/packages/Python/lldbsuite/test/dotest.py @@ -673,16 +673,17 @@ def setupSysPath(): # Assume lldb-mi is in same place as lldb # If not found, disable the lldb-mi tests - lldbMiExec = None - if lldbtest_config.lldbExec and is_exe(lldbtest_config.lldbExec + "-mi"): - lldbMiExec = lldbtest_config.lldbExec + "-mi" - if not lldbMiExec: + # TODO: Append .exe on Windows + # - this will be in a separate commit in case the mi tests fail horribly + lldbDir = os.path.dirname(lldbtest_config.lldbExec) + lldbMiExec = os.path.join(lldbDir, "lldb-mi") + if is_exe(lldbMiExec): + os.environ["LLDBMI_EXEC"] = lldbMiExec + else: if not configuration.shouldSkipBecauseOfCategories(["lldb-mi"]): print( "The 'lldb-mi' executable cannot be located. The lldb-mi tests can not be run as a result.") configuration.skipCategories.append("lldb-mi") - else: - os.environ["LLDBMI_EXEC"] = lldbMiExec lldbPythonDir = None # The directory that contains 'lldb/__init__.py' if configuration.lldbFrameworkPath: |
