From 72ca5bb92432b9250573a07602ad662c9ea52a4c Mon Sep 17 00:00:00 2001 From: Joel Maher Date: Mon, 17 Nov 2014 11:01:23 -0500 Subject: [PATCH] Bug 1057512 - --run-by-dir enabled for browser-chrome on trunk. r=RyanVM --- browser/base/content/test/newtab/browser.ini | 1 + browser/components/search/test/browser.ini | 2 +- browser/components/tabview/test/browser.ini | 2 +- testing/mochitest/runtests.py | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/browser/base/content/test/newtab/browser.ini b/browser/base/content/test/newtab/browser.ini index 12796489997..e56e11f1726 100644 --- a/browser/base/content/test/newtab/browser.ini +++ b/browser/base/content/test/newtab/browser.ini @@ -21,6 +21,7 @@ skip-if = os == "mac" # Intermittent failures, bug 898317 [browser_newtab_bug998387.js] [browser_newtab_disable.js] [browser_newtab_drag_drop.js] +skip-if = os == "win" && debug # bug 1097056; test fails in --run-by-dir mode on win8 x64 debug [browser_newtab_drag_drop_ext.js] [browser_newtab_drop_preview.js] [browser_newtab_enhanced.js] diff --git a/browser/components/search/test/browser.ini b/browser/components/search/test/browser.ini index eb0f0e7ce6a..696f6b50abd 100644 --- a/browser/components/search/test/browser.ini +++ b/browser/components/search/test/browser.ini @@ -36,4 +36,4 @@ skip-if = e10s # Bug ?????? - Test uses load event and checks event.target. [browser_yahoo_behavior.js] skip-if = e10s # Bug ?????? - some issue with progress listeners [JavaScript Error: "req.originalURI is null" {file: "chrome://mochitests/content/browser/browser/components/search/test/browser_bing_behavior.js" line: 127}] [browser_abouthome_behavior.js] -skip-if = e10s # Bug ??????? +skip-if = e10s || os == "win" # Bug ??????, Bug 1100301 - leaks windows until shutdown when --run-by-dir diff --git a/browser/components/tabview/test/browser.ini b/browser/components/tabview/test/browser.ini index cd631db3d37..5df9fd3eaea 100644 --- a/browser/components/tabview/test/browser.ini +++ b/browser/components/tabview/test/browser.ini @@ -19,7 +19,7 @@ support-files = [browser_tabview_bug587231.js] skip-if = buildapp == 'mulet' [browser_tabview_bug587276.js] -skip-if = e10s # Bug 1091200 +skip-if = e10s || true # Bug 1091200, bug 1096285 [browser_tabview_bug587351.js] [browser_tabview_bug587503.js] [browser_tabview_bug587990.js] diff --git a/testing/mochitest/runtests.py b/testing/mochitest/runtests.py index 0dfdbc45acf..76905b23ddc 100644 --- a/testing/mochitest/runtests.py +++ b/testing/mochitest/runtests.py @@ -1711,6 +1711,11 @@ class Mochitest(MochitestUtilsMixin): self.setTestRoot(options) + # Until we have all green, this only runs on bc* jobs (not dt* jobs) + # skipping on e10s jobs as we have a few extra failures + if options.browserChrome and not options.subsuite and not options.e10s: + options.runByDir = True + if not options.runByDir: return self.runMochitests(options, onLaunch)