Fix lookup path for lldb-mi

[beanz]

Summary

The test suite calls realpath on the lldb executable then append "-mi" to it to find the path of the lldb-mi executable. This does not work when using CMake builds on *nix platforms. On *nix platforms when a version number is set on executables CMake generates the binary as ${name}-${version} with a symlink named ${name} pointing to it.

This results in the lldb executable being named lldb-4.0.0, and since lldb-4.0.0-mi doesn't ever match the lldb-mi executable these tests are always disabled.

This patch looks for lldb-mi in the same directory as lldb.

[zturner]

Heh. It just occurred to me that this is probably the reason why all of the lldb-mi tests fail on Windows. Because .exe is not appended. I'm not ready to turn that on and deal with all the failures just yet, but for now can you please add a #TODO right above this that says "Append .exe on Windows"

[tfiala]

Looks good!

[enlight]

In D25486#567722, @zturner wrote:

Heh. It just occurred to me that this is probably the reason why all of the lldb-mi tests fail on Windows. Because .exe is not appended. I'm not ready to turn that on and deal with all the failures just yet, but for now can you please add a #TODO right above this that says "Append .exe on Windows"

Yep, I had to fix this locally just the other day, but all the tests still fail :)

[ki.stfu]

packages/Python/lldbsuite/test/dotest.py

676–677 ↗

(On Diff #74292)

Maybe it would be better to replace "lldb" with "lldb-mi" in lldbtest_config.lldbExec? So we will take into account their versions instead of ignoring them.

[beanz]

packages/Python/lldbsuite/test/dotest.py

676–677 ↗

(On Diff #74292)

That is a good idea, assuming the patch as-is doesn't break the world, I'll revise it to that to fix the Windows issue as well.

lldb/trunk/packages/Python/lldbsuite/test/dotest.py

lldbImpLibDir = os.path.join(
         'lib') if sys.platform.startswith('win32') else lldbLibDir
     os.environ["LLDB_IMPLIB_DIR"] = lldbImpLibDir
     print("LLDB library dir:", os.environ["LLDB_LIB_DIR"])
     print("LLDB import library dir:", os.environ["LLDB_IMPLIB_DIR"])
     os.system('%s -v' % lldbtest_config.lldbExec)
 
     # 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:
         candidatePath = os.path.join(
             configuration.lldbFrameworkPath, 'Resources', 'Python')
         if os.path.isfile(os.path.join(candidatePath, 'lldb/__init__.py')):
             lldbPythonDir = candidatePath
         if not lldbPythonDir: