Bug 1100124 - Add --jsdebugger to run marionette under the jsdebugger…

….;r=ato
shellylin · Dec 18, 2014 · 576352c · 576352c
1 parent bbf86bc
commit 576352c
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 2 deletions.
diff --git a/testing/marionette/client/marionette/geckoinstance.py b/testing/marionette/client/marionette/geckoinstance.py
@@ -52,6 +52,15 @@ def start(self):
         profile_args["preferences"]["marionette.defaultPrefs.port"] = self.marionette_port
         if self.prefs:
             profile_args["preferences"].update(self.prefs)
+        if '-jsdebugger' in self.app_args:
+            profile_args["preferences"].update({
+                "devtools.browsertoolbox.panel": "jsdebugger",
+                "devtools.debugger.remote-enabled": True,
+                "devtools.debugger.chrome-enabled": True,
+                "devtools.chrome.enabled": True,
+                "devtools.debugger.prompt-connection": False,
+                "marionette.debugging.clicktostart": True,
+            })
 
         if hasattr(self, "profile_path") and self.profile is None:
             if not self.profile_path:

diff --git a/testing/marionette/client/marionette/runner/base.py b/testing/marionette/client/marionette/runner/base.py
@@ -390,7 +390,11 @@ def __init__(self, **kwargs):
                         action='store',
                         default='Marionette-based Tests',
                         help='Define the name to associate with the logger used')
-
+        self.add_option('--jsdebugger',
+                        dest='jsdebugger',
+                        action='store_true',
+                        default=False,
+                        help='Enable the jsdebugger for marionette javascript.')
 
     def parse_args(self, args=None, values=None):
         options, tests = OptionParser.parse_args(self, args, values)
@@ -440,6 +444,9 @@ def verify_usage(self, options, tests):
             if not 1 <= options.this_chunk <= options.total_chunks:
                 self.error('Chunk to run must be between 1 and %s.' % options.total_chunks)
 
+        if options.jsdebugger:
+            options.app_args.append('-jsdebugger')
+
         for handler in self.verify_usage_handlers:
             handler(options, tests)
 

diff --git a/testing/marionette/mach_commands.py b/testing/marionette/mach_commands.py
@@ -130,6 +130,8 @@ class MachCommands(MachCommandBase):
         help='Path to gecko profile to use.')
     @CommandArgument('--gecko-log',
         help='Path to gecko log file, or "-" for stdout.')
+    @CommandArgument('--jsdebugger', action='store_true',
+        help='Enable the jsdebugger for marionette javascript.')
     @CommandArgument('tests', nargs='*', metavar='TESTS',
         help='Path to test(s) to run.')
     def run_marionette_test(self, tests, **kwargs):

diff --git a/testing/marionette/marionette-server.js b/testing/marionette/marionette-server.js
@@ -611,7 +611,24 @@ MarionetteServerConnection.prototype = {
         win.addEventListener("load", listener, true);
       }
       else {
-        this.startBrowser(win, true);
+        let clickToStart;
+        try {
+          clickToStart = Services.prefs.getBoolPref('marionette.debugging.clicktostart');
+          Services.prefs.setBoolPref('marionette.debugging.clicktostart', false);
+        } catch (e) { }
+        if (clickToStart && (appName != "B2G")) {
+          let nbox = win.gBrowser.getNotificationBox();
+          let message = "Starting marionette tests with chrome debugging enabled...";
+          let buttons = [{
+            label: "Start execution of marionette tests",
+            accessKey: 'S',
+            callback: () => this.startBrowser(win, true)
+          }];
+          nbox.appendNotification(message, null, null,
+                                  nbox.PRIORITY_WARNING_MEDIUM, buttons);
+        } else {
+          this.startBrowser(win, true);
+        }
       }
     }