Append to CFLAGS_EXTRAS and LD_EXTRAS when building cmdline.

[flackr]

Summary

When building the command-line for compilations during tests, append to CFLAGS_EXTRAS and LD_EXTRAS to preserve switches set by the environment (i.e. for cross compiling to test on another platform).

[flackr]

test/plugins/builder_base.py

89 ↗

(On Diff #23546)

Hmm, I think os.environ[k] might need to be escaped in case it contains ' or ".

[flackr]

Escape quotes and backslashes in environment variable assignments.

[labath]

test/plugins/builder_base.py

101 ↗

(On Diff #23599)

What is the agent that is going to be parsing this?

If it is a posix shell, then the single quotes there don't work the way you expect them to:

$ echo 'a string with a \' inside'
> '
a string with a \ inside

I recommend using double quotes and escaping ", `, $ and \.
http://pubs.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html

[flackr]

Revert first attempt to escape environment variables - need more platform specific investigation.

test/plugins/builder_base.py

101 ↗

(On Diff #23599)

Actually, do you mind if I defer on escaping these and commit the first patchset? It's going to be very platform dependent so I'd prefer to investigate how the environment variables are set on Windows as well and make sure I get the right escaping there too.

[labath]

Sure, go ahead. Quoting is hard. :)

lldb/trunk/test/plugins/builder_base.py

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.
     if not d:
         return ""
     pattern = '%s="%s"' if "win32" in sys.platform else "%s='%s'"
-    cmdline = " ".join([pattern % (k, v) for k, v in d.items()])
+
+    def setOrAppendVariable(k, v):
+        append_vars = ["CFLAGS_EXTRAS", "LD_EXTRAS"]
+        if k in append_vars and os.environ.has_key(k):
+            v = os.environ[k] + " " + v
+        return pattern % (k, v)
+    cmdline = " ".join([setOrAppendVariable(k, v) for k, v in d.items()])
 
     return cmdline
 
 
 def buildDefault(sender=None, architecture=None, compiler=None, dictionary=None, clean=True):
     """Build the binaries the default way."""
     commands = []
     if clean: