Modify dotest.py to be able to run without an lldb build.

[sas]

Summary

This will ease llgs development a bit by not requiring an lldb/lldb.py build to launch the tests. Also, we can now use LLDB_DEBUGSERVER_PATH to point to a debug server to use to run the tests. I used that to point to a ds2 build and run llgs tests against ds2.

[compnerd]

test/dotest.py

950 ↗

(On Diff #17000)

Whats the point of running tests if they are going to fail since you don't have the necessary dependencies?

1102 ↗

(On Diff #17000)

Not your change, but this is equivalent to:

if frameWithVersion:
  lldbPath = before + "LLDB.framework" + after

test/tools/lldb-gdbserver/lldbgdbserverutils.py

60 ↗

(On Diff #17000)

Might be nice to do a check similar to the one below to ensure that the DebugServer is present.

66 ↗

(On Diff #17000)

This might be simpler to read:

for var in ("LLDB_DEBUGSERVER_PATH", "LLDB_EXEC"):
  if os.environ.get(var, None):
    return _get_debug_monitor_from_lldb(os.environ[var], "lldb-gdbserver")
return None

86 ↗

(On Diff #17000)

Similar to above. This might be simpler to read:

for var in ("LLDB_DEBUGSERVER_PATH", "LLDB_EXEC"):
  if os.environ.get(var, None):
    return _get_debug_monitor_from_lldb(os.environ[var], "debugserver")
return None

87 ↗

(On Diff #17000)

In fact, I think you can probably collapse both of these functions into a single one that takes a second parameter which is the debug monitor name and pass that along to the _get_debug_monitor_from_lldb.

[sas]

Thanks for the review Saleem. See comments inline.

test/dotest.py

950 ↗

(On Diff #17000)

Because you can run other tests (not lldb) with this tool. Only the lldb tests will fail if you choose to run them.

test/tools/lldb-gdbserver/lldbgdbserverutils.py

60 ↗

(On Diff #17000)

The existence of the debug server is checked elsewhere in the test suite (in lldbgdbserverutils.py).

66 ↗

(On Diff #17000)

Not really, because when the user specifies LLDB_DEBUGSERVER_PATH, we don't want to go through _gert_debug_monitor_from_lldb again, we just want to use the path directly.

86 ↗

(On Diff #17000)

Ditto.

[compnerd]

test/dotest.py

950 ↗

(On Diff #17000)

Not sure I understand. What are these other tests?

test/tools/lldb-gdbserver/lldbgdbserverutils.py

66 ↗

(On Diff #17000)

Why do we want the different behavior for the two?

[sas]

test/dotest.py

950 ↗

(On Diff #17000)

lldb-mi and llgs for instance.

test/tools/lldb-gdbserver/lldbgdbserverutils.py

66 ↗

(On Diff #17000)

The function name is pretty explicit: _get_debug_monitor_from_lldb gets the debug monitor path by using the lldb path provided. If the user already specified a path to a debug monitor, why would we go through a function that tries to apply intelligence to guess it?

lldb/trunk/test/dotest.py

def setupSysPath():
     bai = ['BuildAndIntegration']
     python_resource_dir = ['LLDB.framework', 'Resources', 'Python']
 
     # Some of the tests can invoke the 'lldb' command directly.
     # We'll try to locate the appropriate executable right here.
 
     lldbExec = None
     lldbMiExec = None
+    lldbHere = None
     if lldbExecutablePath:
         if is_exe(lldbExecutablePath):
             lldbExec = lldbExecutablePath
             lldbHere = lldbExec
         else:
-            print lldbExecutablePath + " is not an executable"
-            sys.exit(-1)
+            print lldbExecutablePath + " is not an executable, lldb tests will fail."
     else:
         # First, you can define an environment variable LLDB_EXEC specifying the
         # full pathname of the lldb executable.
         if "LLDB_EXEC" in os.environ and is_exe(os.environ["LLDB_EXEC"]):
             lldbExec = os.environ["LLDB_EXEC"]
         else:
             lldbExec = None
     
         executable = ['lldb']
         dbgExec  = os.path.join(base, *(xcode3_build_dir + dbg + executable))
         dbgExec2 = os.path.join(base, *(xcode4_build_dir + dbg + executable))
         dbcExec  = os.path.join(base, *(xcode3_build_dir + dbc + executable))
         dbcExec2 = os.path.join(base, *(xcode4_build_dir + dbc + executable))
         relExec  = os.path.join(base, *(xcode3_build_dir + rel + executable))
         relExec2 = os.path.join(base, *(xcode4_build_dir + rel + executable))
         baiExec  = os.path.join(base, *(xcode3_build_dir + bai + executable))
         baiExec2 = os.path.join(base, *(xcode4_build_dir + bai + executable))
     
         # The 'lldb' executable built here in the source tree.
-        lldbHere = None
         if is_exe(dbgExec):
             lldbHere = dbgExec
         elif is_exe(dbgExec2):
             lldbHere = dbgExec2
         elif is_exe(dbcExec):
             lldbHere = dbcExec
         elif is_exe(dbcExec2):
             lldbHere = dbcExec2
else:
                 lldbPath = relPath2
             elif os.path.isfile(os.path.join(baiPath, init_in_python_dir)):
                 lldbPath = baiPath
             elif os.path.isfile(os.path.join(baiPath2, init_in_python_dir)):
                 lldbPath = baiPath2
 
         if not lldbPath:
             print 'This script requires lldb.py to be in either ' + dbgPath + ',',
-            print relPath + ', or ' + baiPath
-            sys.exit(-1)
+            print relPath + ', or ' + baiPath + '. Some tests might fail.'
 
+    if lldbPath:
         # Some of the code that uses this path assumes it hasn't resolved the Versions... link.  
         # If the path we've constructed looks like that, then we'll strip out the Versions/A part.
         (before, frameWithVersion, after) = lldbPath.rpartition("LLDB.framework/Versions/A")
         if frameWithVersion != "" :
             lldbPath = before + "LLDB.framework" + after
 
         lldbPath = os.path.abspath(lldbPath)
 
         # If tests need to find LLDB_FRAMEWORK, now they can do it
         os.environ["LLDB_FRAMEWORK"] = os.path.dirname(os.path.dirname(lldbPath))
 
         # This is to locate the lldb.py module.  Insert it right after sys.path[0].
         sys.path[1:1] = [lldbPath]
         if dumpSysPath:
             print "sys.path:", sys.path
 
 def visit(prefix, dir, names):
     """Visitor function for os.path.walk(path, visit, arg)."""
 
     global suite
     global regexp
     global filters
     global fs4all

lldb/trunk/test/tools/lldb-gdbserver/lldbgdbserverutils.py

 
 def get_lldb_gdbserver_exe():
     """Return the lldb-gdbserver exe path.
 
     Returns:
         A path to the lldb-gdbserver exe if it is found to exist; otherwise,
         returns None.
     """
+    if "LLDB_DEBUGSERVER_PATH" in os.environ:
+        return os.environ["LLDB_DEBUGSERVER_PATH"]
+    elif "LLDB_EXEC" in os.environ:
         lldb_exe = os.environ["LLDB_EXEC"]
         if not lldb_exe:
             return None
         else:
             return _get_debug_monitor_from_lldb(lldb_exe, "lldb-gdbserver")
+    else:
+        return None
 
 def get_debugserver_exe():
     """Return the debugserver exe path.
 
     Returns:
         A path to the debugserver exe if it is found to exist; otherwise,
         returns None.
     """
+    if "LLDB_DEBUGSERVER_PATH" in os.environ:
+        return os.environ["LLDB_DEBUGSERVER_PATH"]
+    elif "LLDB_EXEC" in os.environ:
         lldb_exe = os.environ["LLDB_EXEC"]
         if not lldb_exe:
             return None
         else:
             return _get_debug_monitor_from_lldb(lldb_exe, "debugserver")
+    else:
+        return None
 
 
 _LOG_LINE_REGEX = re.compile(r'^(lldb-gdbserver|debugserver)\s+<\s*(\d+)>' +
     '\s+(read|send)\s+packet:\s+(.+)$')
 
 
 def _is_packet_lldb_gdbserver_input(packet_type, llgs_input_is_read):
     """Return whether a given packet is input for lldb-gdbserver.