From 2a080acfd0b699b23fc64ed28bb0f93b593890ed Mon Sep 17 00:00:00 2001 From: Kaustabh Datta Choudhury Date: Thu, 10 Sep 2015 09:52:00 +0200 Subject: [PATCH] Bug 1162003 - Enable run-by-dir mode on Fx desktop debug & ASAN builds. r=jmaher --- dom/media/test/mochitest.ini | 11 ++++++----- dom/media/webaudio/test/mochitest.ini | 4 ++++ extensions/spellcheck/tests/mochitest/mochitest.ini | 4 ++-- testing/mochitest/runtests.py | 10 ++++++++-- toolkit/components/prompts/test/mochitest.ini | 2 +- .../url-classifier/tests/mochitest/mochitest.ini | 1 + 6 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dom/media/test/mochitest.ini b/dom/media/test/mochitest.ini index 8741040ae9ae..4bd4fcb9e802 100644 --- a/dom/media/test/mochitest.ini +++ b/dom/media/test/mochitest.ini @@ -615,17 +615,17 @@ skip-if = buildapp == 'b2g' && toolkit != 'gonk' # bug 1082984 [test_dormant_playback.html] skip-if = (os == 'win' && os_version == '5.1') || (os != 'win' && toolkit != 'gonk') [test_eme_canvas_blocked.html] -skip-if = toolkit == 'android' || (os == 'win' && !debug) # bug 1043403, bug 1140675 +skip-if = toolkit == 'android' || (os == 'win') # bug 1043403, bug 1140675, win debug : Bug 1202683 [test_eme_non_mse_fails.html] -skip-if = toolkit == 'android' # bug 1043403 +skip-if = toolkit == 'android' || (os == 'win' && debug) # bug 1043403, win debug : Bug 1202683 [test_eme_request_notifications.html] -skip-if = toolkit == 'android' # bug 1043403 +skip-if = toolkit == 'android' || (os == 'win' && debug) # bug 1043403, win debug : Bug 1202683 [test_eme_persistent_sessions.html] -skip-if = toolkit == 'android' # bug 1043403 +skip-if = toolkit == 'android' || (os == 'win' && debug) # bug 1043403, win debug : Bug 1202683 [test_eme_playback.html] skip-if = toolkit == 'android' || toolkit == 'gonk' || os == 'win' # bug 1043403, bug 1187903, bug 1186406, bug 1193351 [test_eme_requestKeySystemAccess.html] -skip-if = toolkit == 'android' # bug 1043403 +skip-if = toolkit == 'android' || (os == 'win' && debug) # bug 1043403, win debug : Bug 1202683 [test_eme_stream_capture_blocked_case1.html] tags=msg capturestream skip-if = toolkit == 'android' || toolkit == 'gonk' || os == 'win' # bug 1043403, bug 1140675, bug 1187903, bug 1193351 @@ -636,6 +636,7 @@ skip-if = toolkit == 'android' || toolkit == 'gonk' || os == 'win' # bug 1043403 tags=msg capturestream skip-if = toolkit == 'android' || toolkit == 'gonk' || os == 'win' # bug 1043403, bug 1140675, bug 1187903, bug 1193351 [test_empty_resource.html] +skip-if = os == 'win' && debug #win debug : Bug 1202683 [test_error_in_video_document.html] skip-if = toolkit == 'android' || (os == 'win' && !debug) || (os == 'mac' && !debug) # bug 608634 [test_error_on_404.html] diff --git a/dom/media/webaudio/test/mochitest.ini b/dom/media/webaudio/test/mochitest.ini index 3e74e610419d..68cad91c98f6 100644 --- a/dom/media/webaudio/test/mochitest.ini +++ b/dom/media/webaudio/test/mochitest.ini @@ -170,6 +170,10 @@ skip-if = (toolkit == 'gonk' && !debug) || android_version == '10' || android_ve [test_stereoPanningWithGain.html] [test_waveDecoder.html] [test_waveShaper.html] +skip-if = os == 'win' && debug #Bug 1202564 [test_waveShaperNoCurve.html] +skip-if = os == 'win' && debug #Bug 1202565 [test_waveShaperPassThrough.html] +skip-if = os == 'win' && debug #Bug 1196084 [test_waveShaperInvalidLengthCurve.html] +skip-if = os == 'win' && debug #Bug 1202567 diff --git a/extensions/spellcheck/tests/mochitest/mochitest.ini b/extensions/spellcheck/tests/mochitest/mochitest.ini index f7457b86197a..b74fbcaa43f6 100644 --- a/extensions/spellcheck/tests/mochitest/mochitest.ini +++ b/extensions/spellcheck/tests/mochitest/mochitest.ini @@ -2,5 +2,5 @@ skip-if = buildapp == 'b2g' || os == 'android' || buildapp == 'mulet' [test_bug1170484.html] -support-files = - helper_bug1170484.js +support-files = helper_bug1170484.js +skip-if = os == 'linux' #Bug 1202570 diff --git a/testing/mochitest/runtests.py b/testing/mochitest/runtests.py index d63822cf4001..2303af67be6e 100644 --- a/testing/mochitest/runtests.py +++ b/testing/mochitest/runtests.py @@ -2523,10 +2523,16 @@ def run_test_harness(options): options.runByDir = False - if runner.getTestFlavor(options) == 'browser-chrome': + if runner.getTestFlavor(options) == 'mochitest': options.runByDir = True - if runner.getTestFlavor(options) == 'mochitest' and (not mozinfo.info['debug']) and (not mozinfo.info['asan']): + if mozinfo.info['asan'] and options.e10s: + options.runByDir = False + + if mozinfo.isMac and mozinfo.info['debug']: + options.runByDir = False + + if runner.getTestFlavor(options) == 'browser-chrome': options.runByDir = True if mozinfo.info.get('buildapp') == 'mulet': diff --git a/toolkit/components/prompts/test/mochitest.ini b/toolkit/components/prompts/test/mochitest.ini index e222d9fa1c17..215fb52b3078 100644 --- a/toolkit/components/prompts/test/mochitest.ini +++ b/toolkit/components/prompts/test/mochitest.ini @@ -11,6 +11,6 @@ skip-if = toolkit == 'android' #TIMED_OUT [test_bug625187.html] [test_bug861605.html] [test_modal_prompts.html] -skip-if = toolkit == 'android' #TIMED_OUT +skip-if = toolkit == 'android' || (os == 'linux' && (debug || asan)) #TIMED_OUT (For Linux : 950636) [test_modal_select.html] skip-if = toolkit == 'android' #TIMED_OUT diff --git a/toolkit/components/url-classifier/tests/mochitest/mochitest.ini b/toolkit/components/url-classifier/tests/mochitest/mochitest.ini index 6e3f51401010..5eb87bc0cd32 100644 --- a/toolkit/components/url-classifier/tests/mochitest/mochitest.ini +++ b/toolkit/components/url-classifier/tests/mochitest/mochitest.ini @@ -16,4 +16,5 @@ support-files = workerFrame.html [test_classifier.html] +skip-if = (os == 'linux' && debug) #Bug 1199778 [test_classifier_worker.html]