Skip to content
This repository has been archived by the owner on Jan 11, 2023. It is now read-only.

Commit

Permalink
sync changes w/ mc (#4060)
Browse files Browse the repository at this point in the history
  • Loading branch information
jasonLaster committed Sep 18, 2017
1 parent 02c7abe commit 311c434
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
5 changes: 0 additions & 5 deletions assets/panel/prefs.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */

#ifdef RELEASE_OR_BETA
pref("devtools.debugger.new-debugger-frontend", false);
#else
pref("devtools.debugger.new-debugger-frontend", true);
#endif

// Enable the Debugger
pref("devtools.debugger.enabled", true);
pref("devtools.debugger.chrome-debugging-host", "localhost");
pref("devtools.debugger.chrome-debugging-port", 6080);
pref("devtools.debugger.chrome-debugging-websocket", false);
pref("devtools.debugger.remote-host", "localhost");
pref("devtools.debugger.remote-timeout", 20000);
Expand Down
6 changes: 4 additions & 2 deletions src/test/mochitest/browser.ini
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,14 @@ support-files =
[browser_dbg-breakpoints.js]
[browser_dbg-breakpoints-toggle.js]
[browser_dbg-breakpoints-reloading.js]
skip-if = true # Bug 1383576
[browser_dbg-breakpoints-cond.js]
[browser_dbg-call-stack.js]
[browser_dbg-expressions.js]
[browser_dbg-scopes.js]
[browser_dbg-chrome-create.js]
skip-if = true
[browser_dbg-chrome-debugging.js]
skip-if = true
skip-if = debug # bug 1374187
[browser_dbg-console.js]
[browser_dbg-debugger-buttons.js]
[browser_dbg-editor-gutter.js]
Expand All @@ -68,6 +68,7 @@ skip-if = true
[browser_dbg_keyboard-shortcuts.js]
skip-if = os == "linux" # bug 1351952
[browser_dbg-pause-exceptions.js]
skip-if = true # Bug 1393121
[browser_dbg-navigation.js]
[browser_dbg-pretty-print.js]
[browser_dbg-pretty-print-paused.js]
Expand All @@ -79,6 +80,7 @@ skip-if = os == "win" # Bug 1393121
[browser_dbg-search-symbols.js]
skip-if = os == "win" # Bug 1393121
[browser_dbg-search-project.js]
skip-if = true # Bug 1393121, 1393299
[browser_dbg-sourcemaps.js]
[browser_dbg-sourcemaps-reloading.js]
[browser_dbg-sourcemaps2.js]
Expand Down

0 comments on commit 311c434

Please sign in to comment.