No bug - fixed merge conflict. a=conflict-fix on a CLOSED TREE
authorDaniel Varga <dvarga@mozilla.com>
Wed, 03 Oct 2018 08:39:52 +0300
changeset 495072 8a2decbbae58a723ebbf8219f57e75d11e2a7e17
parent 495071 59b60df78c0793cf02ef2711bf6f0d79e6878f52
child 495073 d770ea2a1b257febbbbe07a38163d66bdc47e1fd
push id9984
push userffxbld-merge
push dateMon, 15 Oct 2018 21:07:35 +0000
treeherdermozilla-beta@183d27ea8570 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersconflict-fix
milestone64.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
No bug - fixed merge conflict. a=conflict-fix on a CLOSED TREE
devtools/client/debugger/test/mochitest/browser.ini
--- a/devtools/client/debugger/test/mochitest/browser.ini
+++ b/devtools/client/debugger/test/mochitest/browser.ini
@@ -130,65 +130,26 @@ tags = addons
 skip-if = e10s && debug || os == 'win' || verify # bug 1005274
 tags = addons
 [browser_dbg_bfcache.js]
 skip-if = e10s || true # bug 1113935
 [browser_dbg_break-in-anon.js]
 [browser_dbg_break-on-next.js]
 skip-if = true # Bug 1437712
 [browser_dbg_break-on-next-console.js]
-<<<<<<< working copy
-[browser_dbg_break-on-dom-01.js]
-skip-if = true # bug 1368908
-[browser_dbg_break-on-dom-02.js]
-[browser_dbg_break-on-dom-03.js]
-[browser_dbg_break-on-dom-04.js]
-[browser_dbg_break-on-dom-05.js]
-[browser_dbg_break-on-dom-06.js]
-[browser_dbg_break-on-dom-07.js]
-[browser_dbg_break-on-dom-08.js]
-[browser_dbg_break-on-dom-event-01.js]
-skip-if = e10s || os == "mac" || e10s # Bug 895426
-[browser_dbg_break-on-dom-event-02.js]
-skip-if = e10s # TODO
-=======
 uses-unsafe-cpows = true
->>>>>>> merge rev
 [browser_dbg_break-unselected.js]
-<<<<<<< working copy
-[browser_dbg_breakpoints-actual-location.js]
-[browser_dbg_breakpoints-actual-location2.js]
-[browser_dbg_breakpoints-break-on-last-line-of-script-on-reload.js]
-skip-if = e10s # Bug 1093535
-[browser_dbg_breakpoints-condition-thrown-message.js]
-skip-if = e10s && debug
-[browser_dbg_breakpoints-contextmenu-add.js]
-[browser_dbg_breakpoints-contextmenu.js]
-[browser_dbg_breakpoints-disabled-reload.js]
-skip-if = e10s # Bug 1093535
-=======
->>>>>>> merge rev
 [browser_dbg_breakpoints-editor.js]
 skip-if = e10s && debug
 [browser_dbg_breakpoints-eval.js]
 skip-if = e10s && debug
-<<<<<<< working copy
-[browser_dbg_breakpoints-highlight.js]
-skip-if = e10s && debug
-=======
->>>>>>> merge rev
 [browser_dbg_breakpoints-new-script.js]
 skip-if = e10s && debug
 [browser_dbg_breakpoints-other-tabs.js]
 skip-if = e10s && debug
-<<<<<<< working copy
-[browser_dbg_breakpoints-reload.js]
-skip-if = e10s && debug
-=======
->>>>>>> merge rev
 [browser_dbg_bug-896139.js]
 skip-if = e10s && debug
 [browser_dbg_chrome-create.js]
 skip-if = (e10s && debug) || (verify && os == "linux") # Exit code mismatch with verify
 [browser_dbg_chrome-debugging.js]
 skip-if = e10s && debug
 [browser_dbg_clean-exit.js]
 skip-if = true # Bug 1044985 (racy test)
@@ -248,22 +209,11 @@ skip-if = e10s && debug
 skip-if = e10s && debug
 tags = addons
 [browser_dbg_listtabs-01.js]
 [browser_dbg_listtabs-02.js]
 skip-if = true # Never worked for remote frames, needs a mock DebuggerServerConnection
 [browser_dbg_listtabs-03.js]
 skip-if = e10s && debug
 [browser_dbg_listworkers.js]
-<<<<<<< working copy
-[browser_dbg_location-changes-01-simple.js]
-skip-if = e10s && debug
-[browser_dbg_location-changes-02-blank.js]
-skip-if = e10s && debug
-[browser_dbg_location-changes-03-new.js]
-skip-if = e10s # TODO
-[browser_dbg_location-changes-04-breakpoint.js]
-skip-if = e10s # TODO
-=======
->>>>>>> merge rev
 [browser_dbg_multiple-windows.js]
 [browser_dbg_navigation.js]
 skip-if = e10s && debug