Bug 943734 - escape URL arguments in mochitests for the benefit of LLDB; r=jmaher

build/automationutils.py

@@ -67,7 +67,8 @@ DEBUGGER_INFO = {
 
   "lldb": {
     "interactive": True,
-    "args": "--"
+    "args": "--",
+    "requiresEscapedArgs": True
   },
 
   # valgrind doesn't explain much about leaks unless you set the
@@ -211,7 +212,8 @@ def getDebuggerInfo(directory, debugger, debuggerArgs, debuggerInteractive = Fal
     debuggerInfo = {
       "path": debuggerPath,
       "interactive" : getDebuggerInfo("interactive", False),
-      "args": getDebuggerInfo("args", "").split()
+      "args": getDebuggerInfo("args", "").split(),
+      "requiresEscapedArgs": getDebuggerInfo("requiresEscapedArgs", False)
     }
 
     if debuggerArgs:

testing/mochitest/runtests.py

@@ -835,7 +835,9 @@ class Mochitest(MochitestUtilsMixin):
     # https://bugzilla.mozilla.org/show_bug.cgi?id=916512
     args.append('-foreground')
     if testUrl:
-       args.append(testUrl)
+      if debuggerInfo and debuggerInfo['requiresEscapedArgs']:
+        testUrl = testUrl.replace("&", "\\&")
+      args.append(testUrl)
 
     if mozinfo.info["debug"] and not webapprtChrome:
       shutdownLeaks = ShutdownLeaks(log.info)