[test] Pass DSYMUTIL and SDKROOT as part of the make invocation.

[JDevlieghere]

Summary

Pass the DSYMUTIL and SDKROOT variables on the command line instead of the environment. This makes it easier to reproduce the make invocation during development.

[clayborg]

It would be great if we could ensure that if a test fails, that the "dotest" command line text has everything it needs as well, including the options and paths to lldb, framework, shared library and other settings. If I "ninja check-lldb", I have to manually insert many arguments before the command the FAIL file says to run will work.

[aprantl]

Thanks! It was so annoying having to manually specify DSYMUTIL=dsymutil when reproducing builds.

[JDevlieghere]

In D68812#1704235, @clayborg wrote:

It would be great if we could ensure that if a test fails, that the "dotest" command line text has everything it needs as well, including the options and paths to lldb, framework, shared library and other settings. If I "ninja check-lldb", I have to manually insert many arguments before the command the FAIL file says to run will work.

Any reason you want to run dotest.py directly? If you use bin/lldb-dotest you'll get all dotest arguments that CMake configuration. Even better is to use lit --filter <name of test to rerun>, which guarantees that you'll have the exact same dotest.py invocation as during check-ldlb.

[clayborg]

In D68812#1704275, @JDevlieghere wrote:

In D68812#1704235, @clayborg wrote:

It would be great if we could ensure that if a test fails, that the "dotest" command line text has everything it needs as well, including the options and paths to lldb, framework, shared library and other settings. If I "ninja check-lldb", I have to manually insert many arguments before the command the FAIL file says to run will work.

Any reason you want to run dotest.py directly? If you use bin/lldb-dotest you'll get all dotest arguments that CMake configuration. Even better is to use lit --filter <name of test to rerun>, which guarantees that you'll have the exact same dotest.py invocation as during check-ldlb.

it is mainly because that is what the FAIL file for the test run specifies to run. Not sure if that is fixed yet, but that is my ask here was that we fix the code that says "run this command to reproduce this test", which last I checked, was saying to run dotest.py directly.

lldb/packages/Python/lldbsuite/test/plugins/builder_base.py

def getCCSpec(compiler):
     cc = compiler if compiler else None
     if not cc and "CC" in os.environ:
         cc = os.environ["CC"]
     if cc:
         return "CC=\"%s\"" % cc
     else:
         return ""
 
+def getDsymutilSpec():
+    """
+    Helper function to return the key-value string to specify the dsymutil
+    used for the make system.
+    """
+    if "DSYMUTIL" in os.environ:
+        return "DSYMUTIL={}".format(os.environ["DSYMUTIL"])
+    return "";
+
+def getSDKRootSpec():
+    """
+    Helper function to return the key-value string to specify the SDK root
+    used for the make system.
+    """
+    if "SDKROOT" in os.environ:
+        return "SDKROOT={}".format(os.environ["SDKROOT"])
+    return "";
 
 def getCmdLine(d):
     """
     Helper function to return a properly formatted command line argument(s)
     string used for the make system.
     """
 
     # If d is None or an empty mapping, just return an empty string.
def buildDefault(
         sender=None,
         architecture=None,
         compiler=None,
         dictionary=None,
         testdir=None,
         testname=None):
     """Build the binaries the default way."""
     commands = []
-    commands.append(getMake(testdir, testname) + ["all", getArchSpec(architecture),
-                     getCCSpec(compiler), getCmdLine(dictionary)])
+    commands.append(getMake(testdir, testname) +
+                    ["all",
+                     getArchSpec(architecture),
+                     getCCSpec(compiler),
+                     getDsymutilSpec(),
+                     getSDKRootSpec(),
+                     getCmdLine(dictionary)])
 
     runBuildCommands(commands, sender=sender)
 
     # True signifies that we can handle building default.
     return True
 
 
 def buildDwarf(
         sender=None,
         architecture=None,
         compiler=None,
         dictionary=None,
         testdir=None,
         testname=None):
     """Build the binaries with dwarf debug info."""
     commands = []
     commands.append(getMake(testdir, testname) +
-                    ["MAKE_DSYM=NO", getArchSpec(architecture),
-                     getCCSpec(compiler), getCmdLine(dictionary)])
+                    ["MAKE_DSYM=NO",
+                     getArchSpec(architecture),
+                     getCCSpec(compiler),
+                     getDsymutilSpec(),
+                     getSDKRootSpec(),
+                     getCmdLine(dictionary)])
 
     runBuildCommands(commands, sender=sender)
     # True signifies that we can handle building dwarf.
     return True
 
 
 def buildDwo(
         sender=None,
         architecture=None,
         compiler=None,
         dictionary=None,
         testdir=None,
         testname=None):
     """Build the binaries with dwarf debug info."""
     commands = []
     commands.append(getMake(testdir, testname) +
-                    ["MAKE_DSYM=NO", "MAKE_DWO=YES",
+                    ["MAKE_DSYM=NO",
+                     "MAKE_DWO=YES",
                      getArchSpec(architecture),
                      getCCSpec(compiler),
+                     getDsymutilSpec(),
+                     getSDKRootSpec(),
                      getCmdLine(dictionary)])
 
     runBuildCommands(commands, sender=sender)
     # True signifies that we can handle building dwo.
     return True
 
 
 def buildGModules(
         sender=None,
         architecture=None,
         compiler=None,
         dictionary=None,
         testdir=None,
         testname=None):
     """Build the binaries with dwarf debug info."""
     commands = []
     commands.append(getMake(testdir, testname) +
                     ["MAKE_DSYM=NO",
                      "MAKE_GMODULES=YES",
                      getArchSpec(architecture),
                      getCCSpec(compiler),
+                     getDsymutilSpec(),
+                     getSDKRootSpec(),
                      getCmdLine(dictionary)])
 
     lldbtest.system(commands, sender=sender)
     # True signifies that we can handle building with gmodules.
     return True
 
 
 def cleanup(sender=None, dictionary=None):
     """Perform a platform-specific cleanup after the test."""
     return True