Bug 761125 - change mochitests to run all tests except excludedtests in android.json. r=jgriffin

This commit is contained in:
Joel Maher 2012-06-14 09:01:23 -04:00
parent 75ffd2287b
commit 1d18a6bd56
6 changed files with 354 additions and 415 deletions

View File

@ -125,10 +125,6 @@ _TEST_FILES = \
$(NULL)
# Bug 759221
# These tests are not built on Android because they were failing when we
# enabled these tests on Android. The intent is to re-enable them as soon
# as possible, and/or switch to a cleaner way to manage known-to-fail tests.
ifneq ($(OS_TARGET),Android)
_TEST_FILES += \
test_autoplay_contentEditable.html \
test_buffered.html \
@ -139,7 +135,6 @@ _TEST_FILES += \
test_playback.html \
test_seekLies.html \
$(NULL)
endif
# Don't run in suite
ifndef MOZ_SUITE
@ -249,10 +244,6 @@ _TEST_FILES += \
$(NULL)
# Bug 759221
# These tests are not built on Android because they were failing when we
# enabled these tests on Android. The intent is to re-enable them as soon
# as possible, and/or switch to a cleaner way to manage known-to-fail tests.
ifneq ($(OS_TARGET),Android)
_TEST_FILES += \
test_bug686137.html \
test_contentDuration1.html \
@ -272,7 +263,6 @@ _TEST_FILES += \
test_framebuffer.html \
test_seekable2.html \
$(NULL)
endif
else
_TEST_FILES += \
test_can_play_type_no_ogg.html \
@ -296,17 +286,12 @@ _TEST_FILES += \
# Bug 759221
# These tests are not built on Android because they were failing when we
# enabled these tests on Android. The intent is to re-enable them as soon
# as possible, and/or switch to a cleaner way to manage known-to-fail tests.
ifneq ($(OS_TARGET),Android)
_TEST_FILES += \
test_fragment_play.html \
test_fragment_noplay.html \
test_wave_data_u8.html \
test_wave_data_s16.html \
$(NULL)
endif
else
_TEST_FILES += \
test_can_play_type_no_wave.html \

View File

@ -72,7 +72,6 @@ _SERV_FILES = \
pywebsocket_wrapper.py \
plain-loop.html \
android.json \
android-failures.json \
$(NULL)
ifeq ($(MOZ_BUILD_APP),mobile/android)

View File

@ -1,342 +0,0 @@
{"content/base/test/test_CSP.html": "TIMED_OUT",
"content/base/test/test_CSP_frameancestors.html": "",
"content/base/test/test_CSP_inlinescript.html": "",
"content/base/test/test_CrossSiteXHR.html": "",
"content/base/test/test_CrossSiteXHR_cache.html": "",
"content/base/test/test_CrossSiteXHR_origin.html": "",
"content/base/test/test_DOMException.html": "",
"content/base/test/test_bug166235.html": "",
"content/base/test/test_bug338583.html": "",
"content/base/test/test_bug466080.html": "",
"content/base/test/test_bug503481.html": "TIMED_OUT",
"content/base/test/test_bug503481b.html": "TIMED_OUT",
"content/base/test/test_bug505783.html": "TIMED_OUT",
"content/media/test/test_closing_connections.html": "",
"content/media/test/test_constants.html": "",
"content/media/test/test_contentDuration1.html": "TIMED_OUT",
"content/media/test/test_contentDuration2.html": "TIMED_OUT",
"content/media/test/test_contentDuration3.html": "TIMED_OUT",
"content/media/test/test_contentDuration4.html": "TIMED_OUT",
"content/base/test/test_copypaste.html": "",
"content/base/test/test_csp_redirects.html": "TIMED_OUT",
"content/base/test/test_mozfiledataurl.html": "TIMED_OUT",
"content/base/test/test_mutationobservers.html": "",
"content/base/test/test_range_bounds.html": "",
"content/base/test/test_reentrant_flush.html": "RANDOM",
"content/base/test/test_sync_xhr_timer.xhtml": "RANDOM",
"content/base/test/test_websocket.html": "",
"content/base/test/test_websocket_basic.html": "",
"content/base/test/test_websocket_hello.html": "",
"content/base/test/test_x-frame-options.html": "",
"content/base/test/test_xhr_abort_after_load.html": "",
"content/base/test/test_xhr_forbidden_headers.html": "",
"content/base/test/test_xhr_progressevents.html": "",
"content/base/test/websocket_hybi/test_receive-arraybuffer.html": "",
"content/base/test/websocket_hybi/test_receive-blob.html": "",
"content/base/test/websocket_hybi/test_send-arraybuffer.html": "",
"content/base/test/websocket_hybi/test_send-blob.html": "",
"content/events/test/test_bug409604.html": "TIMED_OUT",
"content/events/test/test_bug426082.html": "",
"content/events/test/test_bug457672.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug502818.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug508479.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug508906.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug517851.htm": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug534833.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug545268.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug547996-1.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug547996-2.xhtml": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug556493.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug574663.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug603008.html": "",
"content/events/test/test_bug605242.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug607464.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug613634.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug624127.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug635465.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug648573.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug650493.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug656379-1.html": "TIMED_OUT",
"content/events/test/test_bug656379-2.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug656954.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug659350.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug662678.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug667612.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug667919-1.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug667919-2.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug689564.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug698929.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug741666.html": "",
"content/events/test/test_clickevent_on_input.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_dom_keyboard_event.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_dom_mouse_event.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_draggableprop.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_dragstart.html": "TIMED_OUT",
"content/events/test/test_eventctors.html": "CRASH_DUMP, RANDOM",
"content/events/test": "CRASH_DUMP, RANDOM",
"content/html/content/test/test_bug209275.xhtml": "TIMED_OUT",
"content/html/content/test/test_bug481335.xhtml": "TIMED_OUT",
"content/html/content/test/test_bug514856.html": "",
"content/html/content/test/test_bug557087-2.html": "TIMED_OUT",
"content/html/content/test/test_bug612730.html": "",
"content/html/content/test/test_bug615833.html": "TIMED_OUT",
"content/html/content/test/test_formSubmission.html": "TIMED_OUT",
"content/html/content/test/test_formSubmission2.html": "",
"content/html/content/test/test_fullscreen-api.html": "TIMED_OUT",
"content/html/content/test/test_object_plugin_nav.html": "TIMED_OUT",
"content/html/document/test/test_bug369370.html": "",
"content/html/document/test/test_bug391777.html": "",
"content/html/document/test/test_bug445004.html": "",
"content/html/document/test/test_bug446483.html": "",
"content/html/document/test/test_bug741266.html": "",
"content/media/test/test_access_control.html": "",
"content/media/test/test_audio1.html": "",
"content/media/test/test_audio2.html": "",
"content/media/test/test_autoplay.html": "",
"content/media/test/test_autoplay_contentEditable.html": "",
"content/media/test/test_buffered.html": "",
"content/media/test/test_bug448534.html": "",
"content/media/test/test_bug463162.xhtml": "",
"content/media/test/test_bug465498.html": "",
"content/media/test/test_bug493187.html": "",
"content/media/test/test_bug495145.html": "",
"content/media/test/test_bug495300.html": "",
"content/media/test/test_bug686137.html": "TIMED_OUT",
"content/media/test/test_bug686942.html": "",
"content/media/test/test_bug726904.html": "",
"content/media/test/test_can_play_type.html": "",
"content/media/test/test_can_play_type_ogg.html": "",
"content/media/test/test_can_play_type_wave.html": "",
"content/media/test/test_can_play_type_webm.html": "",
"content/media/test/test_contentDuration5.html": "TIMED_OUT",
"content/media/test/test_contentDuration6.html": "TIMED_OUT",
"content/media/test/test_contentDuration7.html": "",
"content/media/test/test_decode_error.html": "",
"content/media/test/test_decoder_disable.html": "",
"content/media/test/test_defaultMuted.html": "",
"content/media/test/test_delay_load.html": "",
"content/media/test/test_error_in_video_document.html": "",
"content/media/test/test_error_on_404.html": "",
"content/media/test/test_fragment_noplay.html": "",
"content/media/test/test_fragment_play.html": "",
"content/media/test/test_framebuffer.html": "",
"content/media/test/test_info_leak.html": "",
"content/media/test/test_load.html": "",
"content/media/test/test_load_candidates.html": "",
"content/media/test/test_load_same_resource.html": "",
"content/media/test/test_load_source.html": "",
"content/media/test/test_loop.html": "",
"content/media/test/test_media_selection.html": "",
"content/media/test/test_mozHasAudio.html": "",
"content/media/test/test_mozLoadFrom.html": "",
"content/media/test/test_networkState.html": "",
"content/media/test/test_new_audio.html": "",
"content/media/test/test_no_load_event.html": "",
"content/media/test/test_paused.html": "",
"content/media/test/test_paused_after_ended.html": "",
"content/media/test/test_play_events.html": "",
"content/media/test/test_play_events_2.html": "",
"content/media/test/test_play_twice.html": "",
"content/media/test/test_playback.html": "",
"content/media/test/test_playback_errors.html": "",
"content/media/test/test_played.html": "",
"content/media/test/test_preload_actions.html": "",
"content/media/test/test_progress.html": "",
"content/media/test/test_reactivate.html": "",
"content/media/test/test_referer.html": "",
"content/media/test/test_replay_metadata.html": "",
"content/media/test/test_seek.html": "",
"content/media/test/test_seekLies.html": "TIMED_OUT",
"content/media/test/test_seek_out_of_range.html": "",
"content/media/test/test_seekable1.html": "",
"content/media/test/test_seekable2.html": "",
"content/media/test/test_seekable3.html": "",
"content/media/test/test_source.html": "",
"content/media/test/test_source_media.html": "",
"content/media/test/test_source_null.html": "",
"content/media/test/test_source_write.html": "",
"content/media/test/test_standalone.html": "",
"content/media/test/test_streams_element_capture.html": "",
"content/media/test/test_streams_element_capture_reset.html": "",
"content/media/test/test_timeupdate_small_files.html": "",
"content/media/test/test_too_many_elements.html": "",
"content/media/test/test_video_to_canvas.html": "",
"content/media/test/test_wave_data_s16.html": "TIMED_OUT",
"content/media/test/test_wave_data_u8.html": "TIMED_OUT",
"content/smil/test/test_smilRepeatTiming.xhtml": "TIMED_OUT",
"content/smil/test/test_smilExtDoc.xhtml": "",
"content/xul/content/test/test_bug486990.xul": "TIMED_OUT",
"docshell/test/navigation/test_bug430723.html": "TIMED_OUT",
"docshell/test/navigation/test_sessionhistory.html": "RANDOM",
"docshell/test/test_bug344861.html": "",
"docshell/test/test_bug94514.html": "TIMED_OUT",
"docshell/test/test_bug413310.html": "",
"docshell/test/test_bug598895.html": "",
"docshell/test/test_bug637644.html": "",
"docshell/test/test_bug668513.html": "RANDOM",
"dom/imptests/editing/conformancetest/test_event.html": "",
"dom/imptests/editing/conformancetest/test_runtest.html": "",
"dom/imptests/html/tests/submission/Mozilla/test_window-onerror-parse-error.html": "",
"dom/imptests/html/tests/submission/Mozilla/test_window-onerror-runtime-error-throw.html": "",
"dom/imptests/html/tests/submission/Mozilla/test_window-onerror-runtime-error.html": "",
"dom/indexedDB/test/test_deleteDatabase.html": "",
"dom/indexedDB/test/test_deleteDatabase_interactions.html": "",
"dom/indexedDB/test/test_file_os_delete.html": "",
"dom/network/tests/test_network_basics.html": "",
"dom/settings/tests/test_settings_events.html": "",
"dom/sms/tests/test_sms_basics.html": "",
"dom/tests/mochitest/ajax/offline/test_simpleManifest.html": "TIMED_OUT",
"dom/tests/mochitest/ajax/offline/test_updatingManifest.html": "TIMED_OUT",
"dom/tests/mochitest/ajax/offline/test_xhtmlManifest.xhtml": "TIMED_OUT",
"dom/tests/mochitest/ajax/prototype/test_Prototype.html": "",
"dom/tests/mochitest/ajax/scriptaculous/test_Scriptaculous.html": "",
"dom/tests/mochitest/browser-frame/test_browserFrame1.html": "TIMED_OUT",
"dom/tests/mochitest/bugs/test_bug260264.html": "",
"dom/tests/mochitest/bugs/test_bug291653.html": "TIMED_OUT",
"dom/tests/mochitest/bugs/test_bug369306.html": "TIMED_OUT",
"dom/tests/mochitest/bugs/test_bug406375.html": "",
"dom/tests/mochitest/bugs/test_bug414291.html": "",
"dom/tests/mochitest/bugs/test_bug427744.html": "",
"dom/tests/mochitest/bugs/test_bug437361.html": "",
"dom/tests/mochitest/bugs/test_bug479143.html": "",
"dom/tests/mochitest/bugs/test_bug504862.html": "RANDOM",
"dom/tests/mochitest/bugs/test_bug61098.html": "",
"dom/tests/mochitest/bugs/test_bug641552.html": "",
"dom/tests/mochitest/bugs/test_resize_move_windows.html": "TIMED_OUT",
"dom/tests/mochitest/bugs/test_window_bar.html": "",
"dom/tests/mochitest/devicestorage/test_basic.html": "",
"dom/tests/mochitest/devicestorage/test_dotdot.html": "",
"dom/tests/mochitest/devicestorage/test_enumerate.html": "",
"dom/tests/mochitest/devicestorage/test_enumerateMultipleContinue.html": "",
"dom/tests/mochitest/devicestorage/test_overwrite.html": "",
"dom/tests/mochitest/devicestorage/test_sanity.html": "",
"dom/tests/mochitest/dom-level2-core/test_documentimportnode03.html": "",
"dom/tests/mochitest/dom-level2-core/test_documentimportnode04.html": "",
"dom/tests/mochitest/dom-level2-core/test_documentimportnode21.html": "",
"dom/tests/mochitest/general/test_497898.html": "",
"dom/tests/mochitest/general/test_focusrings.xul": "TIMED_OUT",
"dom/tests/mochitest/general/test_vibrator.html": "CRASH_SUTAGENT",
"dom/tests/mochitest/general/test_windowProperties.html": "",
"dom/tests/mochitest/geolocation/test_allowCurrent.html": "TIMED_OUT",
"dom/tests/mochitest/geolocation/test_allowWatch.html": "TIMED_OUT",
"dom/tests/mochitest/geolocation/test_clearWatch.html": "TIMED_OUT",
"dom/tests/mochitest/geolocation/test_manyCurrentConcurrent.html": "TIMED_OUT",
"dom/tests/mochitest/geolocation/test_manyCurrentSerial.html": "TIMED_OUT",
"dom/tests/mochitest/geolocation/test_manyWatchConcurrent.html": "TIMED_OUT",
"dom/tests/mochitest/geolocation/test_manyWatchSerial.html": "TIMED_OUT",
"dom/tests/mochitest/geolocation/test_shutdown.html": "TIMED_OUT",
"dom/tests/mochitest/geolocation/test_windowClose.html": "TIMED_OUT",
"dom/tests/mochitest/geolocation/test_worseAccuracyDoesNotBlockCallback.html": "TIMED_OUT",
"dom/tests/mochitest/localstorage/test_bug624047.html": "TIMED_OUT",
"dom/tests/mochitest/localstorage/test_localStorageOriginsSchemaDiffs.html": "TIMED_OUT",
"dom/tests/mochitest/localstorage/test_localStorageOriginsEquals.html": "",
"dom/tests/mochitest/localstorage/test_localStorageQuota.html": "TIMED_OUT",
"dom/tests/mochitest/localstorage/test_localStorageQuotaSessionOnly.html": "TIMED_OUT",
"dom/tests/mochitest/localstorage/test_localStorageQuotaSessionOnly2.html": "TIMED_OUT",
"dom/tests/mochitest/localstorage/test_localStorageReplace.html": "",
"dom/tests/mochitest/localstorage/test_removeOwnersAPI.html": "TIMED_OUT",
"dom/tests/mochitest/localstorage/test_removeOwnersAPISessionOnly.html": "TIMED_OUT",
"dom/tests/mochitest/pointerlock/test_pointerlock-api.html": "TIMED_OUT",
"dom/tests/mochitest/sessionstorage/test_sessionStorageClone.html": "",
"dom/tests/mochitest/sessionstorage/test_sessionStorageHttpHttps.html": "TIMED_OUT",
"dom/tests/mochitest/whatwg/test_bug500328.html": "TIMED_OUT",
"editor/composer/test/test_bug389350.html": "",
"editor/libeditor/base/tests/test_bug408231.html": "",
"editor/libeditor/base/tests/test_bug586662.html": "",
"editor/libeditor/html/tests/test_bug372345.html": "",
"editor/libeditor/html/tests/test_bug410986.html": "",
"editor/libeditor/html/tests/test_bug432225.html": "",
"editor/libeditor/html/tests/test_bug478725.html": "",
"editor/libeditor/html/tests/test_bug480972.html": "",
"editor/libeditor/html/tests/test_bug484181.html": "",
"editor/libeditor/html/tests/test_bug520189.html": "",
"editor/libeditor/html/tests/test_bug525389.html": "",
"editor/libeditor/html/tests/test_bug549262.html": "",
"editor/libeditor/html/tests/test_bug599322.html": "",
"editor/libeditor/html/tests/test_bug611182.html": "",
"editor/libeditor/html/tests/test_bug620906.html": "TIMED_OUT",
"editor/libeditor/html/tests/test_bug674770-1.html": "",
"editor/libeditor/html/tests/test_bug674770-2.html": "",
"editor/libeditor/html/tests/test_spellcheck_pref.html": "",
"editor/libeditor/text/tests/test_bug527935.html": "",
"editor/libeditor/text/tests/test_bug569988.html": "TIMED_OUT",
"editor/libeditor/text/tests/test_bug596333.html": "",
"editor/libeditor/text/tests/test_bug600570.html": "",
"editor/libeditor/text/tests/test_bug604532.html": "",
"editor/libeditor/text/tests/test_bug629172.html": "",
"editor/libeditor/text/tests/test_texteditor_keyevent_handling.html": "",
"embedding/test/test_bug449141.html": "",
"embedding/test/test_window_open_units.html": "",
"js/jsd/test/test_bug507448.html": "TIMED_OUT",
"js/jsd/test/test_bug617870-callhooks.html": "TIMED_OUT",
"layout/base/tests/test_bug332655-1.html": "",
"layout/base/tests/test_bug603550.html": "TIMED_OUT",
"layout/base/tests/test_bug629838.html": "",
"layout/base/tests/test_flush_on_paint.html": "",
"layout/base/tests/test_mozPaintCount.html": "",
"layout/base/tests/test_reftests_with_caret.html": "",
"layout/forms/test/test_bug348236.html": "",
"layout/forms/test/test_bug378670.html": "TIMED_OUT",
"layout/forms/test/test_bug446663.html": "",
"layout/forms/test/test_bug478219.xhtml": "",
"layout/forms/test/test_bug564115.html": "TIMED_OUT",
"layout/forms/test/test_bug571352.html": "TIMED_OUT",
"layout/forms/test/test_bug572649.html": "TIMED_OUT",
"layout/forms/test/test_bug644542.html": "TIMED_OUT",
"layout/forms/test/test_bug672810.html": "",
"layout/forms/test/test_textarea_resize.html": "",
"layout/generic/test/test_bug496275.html": "CRASH_DUMP",
"layout/generic/test/test_bug503813.html": "CRASH_DUMP",
"layout/generic/test/test_bug514732.html": "CRASH_DUMP",
"layout/generic/test/test_invalidate_during_plugin_paint.html": "",
"layout/generic/test/test_plugin_mouse_coords.html": "",
"layout/generic": "CRASH_DUMP, RANDOM, ONLY IN CHUNK 10",
"layout/style/test/test_animations.html": "",
"layout/style/test/test_bug379440.html": "",
"layout/style/test/test_compute_data_with_start_struct.html": "",
"layout/style/test/test_inherit_computation.html": "",
"layout/style/test/test_initial_computation.html": "",
"layout/style/test/test_value_computation.html": "",
"layout/style/test/test_visited_image_loading.html": "TIMED_OUT",
"layout/style/test/test_visited_image_loading_empty.html": "TIMED_OUT",
"layout/style/test/test_visited_lying.html": "",
"layout/style/test/test_visited_pref.html": "TIMED_OUT",
"layout/style/test/test_visited_reftests.html": "TIMED_OUT",
"parser/htmlparser/tests/mochitest/test_html5_tree_construction.html": "TIMED_OUT",
"parser/htmlparser/tests/mochitest/test_html5_tree_construction_part2.html": "TIMED_OUT",
"robocop": "TIMED_OUT",
"security/ssl/bugs/test_bug480509.html": "",
"security/ssl/bugs/test_bug483440.html": "",
"security/ssl/bugs/test_bug484111.html": "",
"security/ssl/mixedcontent": "TIMED_OUT",
"security/ssl/stricttransportsecurity/test_stricttransportsecurity.html": "TIMED_OUT",
"security/ssl/stricttransportsecurity/test_sts_privatebrowsing.html": "TIMED_OUT",
"toolkit/components/alerts/test/test_alerts.html": "",
"toolkit/components/passwordmgr/test/test_basic_form_autocomplete.html": "",
"toolkit/components/passwordmgr/test/test_master_password.html": "TIMED_OUT",
"toolkit/components/passwordmgr/test/test_maxforms_1.html": "TIMED_OUT",
"toolkit/components/passwordmgr/test/test_maxforms_2.html": "TIMED_OUT",
"toolkit/components/passwordmgr/test/test_maxforms_3.html": "TIMED_OUT",
"toolkit/components/passwordmgr/test/test_bug_627616.html": "TIMED_OUT",
"toolkit/components/passwordmgr/test/test_master_password_cleanup.html": "",
"toolkit/components/passwordmgr/test/test_notifications.html": "",
"toolkit/components/passwordmgr/test/test_prompt.html": "TIMED_OUT",
"toolkit/components/passwordmgr/test/test_prompt_async.html": "TIMED_OUT",
"toolkit/components/passwordmgr/test/test_xhr.html": "TIMED_OUT",
"toolkit/components/passwordmgr/test/test_xml_load.html": "TIMED_OUT",
"toolkit/components/places/tests/test_bug_411966.html": "RANDOM",
"toolkit/components/prompts/test/test_bug620145.html": "TIMED_OUT",
"toolkit/components/prompts/test/test_modal_prompts.html": "TIMED_OUT",
"toolkit/components/prompts/test/test_modal_select.html": "TIMED_OUT",
"toolkit/components/satchel/test/test_bug_511615.html": "",
"toolkit/components/satchel/test/test_form_autocomplete.html": "TIMED_OUT",
"toolkit/components/satchel/test/test_form_autocomplete_with_list.html": "",
"toolkit/components/satchel/test/test_form_submission.html": "",
"toolkit/components/satchel/test/test_form_submission_cap.html": "",
"toolkit/components/satchel/test/test_form_submission_cap2.html": "",
"toolkit/content/tests/widgets/test_audiocontrols_dimensions.html": "",
"toolkit/content/tests/widgets/test_contextmenu_nested.xul": "",
"toolkit/content/tests/widgets/test_menubar.xul": "W/SharedBufferStack(21799): waitForCondition(LockCondition) timed out (identity=34, status=0). CPU may be pegged. trying again",
"toolkit/content/tests/widgets/test_videocontrols.html": "TIMED_OUT",
"uriloader/exthandler/tests/mochitest/test_handlerApps.xhtml": ""
}

View File

@ -1,30 +1,290 @@
{"content/canvas/test": "",
"content/media/test": "",
"content/smil/test": "",
"content/xml/document/test": "",
"content/xslt/tests/mochitest": "",
"dom/file/test": "",
"dom/indexedDB/test": "",
"dom/src/json/test": "",
"dom/src/jsurl/test": "",
"dom/tests/mochitest/dom-level0": "", "js": "",
"dom/tests/mochitest/dom-level1-core": "",
"dom/tests/mochitest/dom-level2-core": "",
"dom/tests/mochitest/ajax/mochikit": "",
"dom/tests/mochitest/ajax/scriptaculous": "",
"dom/tests/mochitest/ajax/jquery": "",
"dom/tests/mochitest/dom-level2-html": "",
"Harness_sanity": "",
"editor/composer/test": "",
"intl/uconv/tests": "",
"dom/tests/mochitest/orientation": "",
"dom/tests/mochitest/storageevent": "",
"layout/xul/test": "",
"modules/libjar/test/mochitest": "",
"layout/inspector/tests": "",
"toolkit/xre/test": "",
"toolkit/components/microformats/tests": "",
"MochiKit-1.4.2/tests": "",
"parser/htmlparser/tests/mochitest": "",
"js": ""
{
"runtests": {},
"excludetests": {
"content/base/test/test_CSP.html": "TIMED_OUT",
"content/base/test/test_CSP_frameancestors.html": "",
"content/base/test/test_CSP_inlinescript.html": "",
"content/base/test/test_CrossSiteXHR.html": "",
"content/base/test/test_CrossSiteXHR_cache.html": "",
"content/base/test/test_CrossSiteXHR_origin.html": "",
"content/base/test/test_DOMException.html": "",
"content/base/test/test_bug166235.html": "",
"content/base/test/test_bug338583.html": "",
"content/base/test/test_bug466080.html": "",
"content/base/test/test_bug503481.html": "TIMED_OUT",
"content/base/test/test_bug503481b.html": "TIMED_OUT",
"content/base/test/test_bug505783.html": "TIMED_OUT",
"content/base/test/test_copypaste.html": "",
"content/base/test/test_csp_redirects.html": "TIMED_OUT",
"content/base/test/test_mozfiledataurl.html": "TIMED_OUT",
"content/base/test/test_mutationobservers.html": "",
"content/base/test/test_range_bounds.html": "",
"content/base/test/test_reentrant_flush.html": "RANDOM",
"content/base/test/test_sync_xhr_timer.xhtml": "RANDOM",
"content/base/test/test_websocket.html": "",
"content/base/test/test_websocket_basic.html": "",
"content/base/test/test_websocket_hello.html": "",
"content/base/test/test_x-frame-options.html": "",
"content/base/test/test_xhr_abort_after_load.html": "",
"content/base/test/test_xhr_forbidden_headers.html": "",
"content/base/test/test_xhr_progressevents.html": "",
"content/base/test/websocket_hybi/test_receive-arraybuffer.html": "",
"content/base/test/websocket_hybi/test_receive-blob.html": "",
"content/base/test/websocket_hybi/test_send-arraybuffer.html": "",
"content/base/test/websocket_hybi/test_send-blob.html": "",
"content/events/test/test_bug409604.html": "TIMED_OUT",
"content/events/test/test_bug426082.html": "",
"content/events/test/test_bug457672.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug502818.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug508479.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug508906.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug517851.htm": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug534833.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug545268.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug547996-1.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug547996-2.xhtml": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug556493.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug574663.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug603008.html": "",
"content/events/test/test_bug605242.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug607464.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug613634.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug624127.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug635465.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug648573.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug650493.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug656379-1.html": "TIMED_OUT",
"content/events/test/test_bug656379-2.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug656954.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug659350.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug662678.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug667612.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug667919-1.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug667919-2.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug689564.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug698929.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_bug741666.html": "",
"content/events/test/test_clickevent_on_input.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_dom_keyboard_event.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_dom_mouse_event.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_draggableprop.html": "CRASH_DUMP, RANDOM",
"content/events/test/test_dragstart.html": "TIMED_OUT",
"content/events/test/test_eventctors.html": "CRASH_DUMP, RANDOM",
"content/events/test": "CRASH_DUMP, RANDOM",
"content/html/content/test/test_bug209275.xhtml": "TIMED_OUT",
"content/html/content/test/test_bug481335.xhtml": "TIMED_OUT",
"content/html/content/test/test_bug514856.html": "",
"content/html/content/test/test_bug557087-2.html": "TIMED_OUT",
"content/html/content/test/test_bug612730.html": "",
"content/html/content/test/test_bug615833.html": "TIMED_OUT",
"content/html/content/test/test_formSubmission.html": "TIMED_OUT",
"content/html/content/test/test_formSubmission2.html": "",
"content/html/content/test/test_fullscreen-api.html": "TIMED_OUT",
"content/html/content/test/test_object_plugin_nav.html": "TIMED_OUT",
"content/html/document/test/test_bug369370.html": "",
"content/html/document/test/test_bug391777.html": "",
"content/html/document/test/test_bug445004.html": "",
"content/html/document/test/test_bug446483.html": "",
"content/html/document/test/test_bug741266.html": "",
"content/media/test/test_autoplay_contentEditable.html": "",
"content/media/test/test_buffered.html": "",
"content/media/test/test_bug448534.html": "",
"content/media/test/test_bug463162.xhtml": "",
"content/media/test/test_bug686137.html": "TIMED_OUT",
"content/media/test/test_contentDuration1.html": "TIMED_OUT",
"content/media/test/test_contentDuration2.html": "TIMED_OUT",
"content/media/test/test_contentDuration3.html": "TIMED_OUT",
"content/media/test/test_contentDuration4.html": "TIMED_OUT",
"content/media/test/test_contentDuration5.html": "TIMED_OUT",
"content/media/test/test_contentDuration6.html": "TIMED_OUT",
"content/media/test/test_contentDuration7.html": "",
"content/media/test/test_decoder_disable.html": "",
"content/media/test/test_fragment_noplay.html": "",
"content/media/test/test_fragment_play.html": "",
"content/media/test/test_framebuffer.html": "",
"content/media/test/test_media_selection.html": "",
"content/media/test/test_playback.html": "",
"content/media/test/test_seekLies.html": "TIMED_OUT",
"content/media/test/test_seekable2.html": "",
"content/media/test/test_wave_data_s16.html": "TIMED_OUT",
"content/media/test/test_wave_data_u8.html": "TIMED_OUT",
"content/smil/test/test_smilRepeatTiming.xhtml": "TIMED_OUT",
"content/smil/test/test_smilExtDoc.xhtml": "",
"content/xul/content/test/test_bug486990.xul": "TIMED_OUT",
"docshell/test/navigation/test_bug430723.html": "TIMED_OUT",
"docshell/test/navigation/test_sessionhistory.html": "RANDOM",
"docshell/test/test_bug344861.html": "",
"docshell/test/test_bug94514.html": "TIMED_OUT",
"docshell/test/test_bug413310.html": "",
"docshell/test/test_bug598895.html": "",
"docshell/test/test_bug637644.html": "",
"docshell/test/test_bug668513.html": "RANDOM",
"dom/imptests/editing/conformancetest/test_event.html": "",
"dom/imptests/editing/conformancetest/test_runtest.html": "",
"dom/imptests/html/tests/submission/Mozilla/test_window-onerror-parse-error.html": "",
"dom/imptests/html/tests/submission/Mozilla/test_window-onerror-runtime-error-throw.html": "",
"dom/imptests/html/tests/submission/Mozilla/test_window-onerror-runtime-error.html": "",
"dom/network/tests/test_network_basics.html": "",
"dom/settings/tests/test_settings_events.html": "",
"dom/sms/tests/test_sms_basics.html": "",
"dom/tests/mochitest/ajax/offline/test_simpleManifest.html": "TIMED_OUT",
"dom/tests/mochitest/ajax/offline/test_updatingManifest.html": "TIMED_OUT",
"dom/tests/mochitest/ajax/offline/test_xhtmlManifest.xhtml": "TIMED_OUT",
"dom/tests/mochitest/ajax/prototype/test_Prototype.html": "",
"dom/tests/mochitest/ajax/scriptaculous/test_Scriptaculous.html": "",
"dom/tests/mochitest/browser-frame/test_browserFrame1.html": "TIMED_OUT",
"dom/tests/mochitest/bugs/test_bug260264.html": "",
"dom/tests/mochitest/bugs/test_bug291653.html": "TIMED_OUT",
"dom/tests/mochitest/bugs/test_bug369306.html": "TIMED_OUT",
"dom/tests/mochitest/bugs/test_bug406375.html": "",
"dom/tests/mochitest/bugs/test_bug414291.html": "",
"dom/tests/mochitest/bugs/test_bug427744.html": "",
"dom/tests/mochitest/bugs/test_bug437361.html": "",
"dom/tests/mochitest/bugs/test_bug479143.html": "",
"dom/tests/mochitest/bugs/test_bug504862.html": "RANDOM",
"dom/tests/mochitest/bugs/test_bug597809.html": "",
"dom/tests/mochitest/bugs/test_bug61098.html": "",
"dom/tests/mochitest/bugs/test_bug641552.html": "",
"dom/tests/mochitest/bugs/test_resize_move_windows.html": "TIMED_OUT",
"dom/tests/mochitest/bugs/test_window_bar.html": "",
"dom/tests/mochitest/devicestorage/test_basic.html": "",
"dom/tests/mochitest/devicestorage/test_dotdot.html": "",
"dom/tests/mochitest/devicestorage/test_enumerate.html": "",
"dom/tests/mochitest/devicestorage/test_enumerateMultipleContinue.html": "",
"dom/tests/mochitest/devicestorage/test_enumerateOptions.html": "",
"dom/tests/mochitest/devicestorage/test_lastModificationFilter.html": "",
"dom/tests/mochitest/devicestorage/test_overwrite.html": "",
"dom/tests/mochitest/devicestorage/test_sanity.html": "",
"dom/tests/mochitest/dom-level2-core/test_documentimportnode03.html": "",
"dom/tests/mochitest/dom-level2-core/test_documentimportnode04.html": "",
"dom/tests/mochitest/dom-level2-core/test_documentimportnode21.html": "",
"dom/tests/mochitest/general/test_497898.html": "",
"dom/tests/mochitest/general/test_focusrings.xul": "TIMED_OUT",
"dom/tests/mochitest/general/test_vibrator.html": "CRASH_SUTAGENT",
"dom/tests/mochitest/general/test_windowProperties.html": "",
"dom/tests/mochitest/geolocation/test_allowCurrent.html": "TIMED_OUT",
"dom/tests/mochitest/geolocation/test_allowWatch.html": "TIMED_OUT",
"dom/tests/mochitest/geolocation/test_clearWatch.html": "TIMED_OUT",
"dom/tests/mochitest/geolocation/test_manyCurrentConcurrent.html": "TIMED_OUT",
"dom/tests/mochitest/geolocation/test_manyCurrentSerial.html": "TIMED_OUT",
"dom/tests/mochitest/geolocation/test_manyWatchConcurrent.html": "TIMED_OUT",
"dom/tests/mochitest/geolocation/test_manyWatchSerial.html": "TIMED_OUT",
"dom/tests/mochitest/geolocation/test_shutdown.html": "TIMED_OUT",
"dom/tests/mochitest/geolocation/test_windowClose.html": "TIMED_OUT",
"dom/tests/mochitest/geolocation/test_worseAccuracyDoesNotBlockCallback.html": "TIMED_OUT",
"dom/tests/mochitest/localstorage/test_bug624047.html": "TIMED_OUT",
"dom/tests/mochitest/localstorage/test_localStorageOriginsSchemaDiffs.html": "TIMED_OUT",
"dom/tests/mochitest/localstorage/test_localStorageOriginsEquals.html": "",
"dom/tests/mochitest/localstorage/test_localStorageQuota.html": "TIMED_OUT",
"dom/tests/mochitest/localstorage/test_localStorageQuotaSessionOnly.html": "TIMED_OUT",
"dom/tests/mochitest/localstorage/test_localStorageQuotaSessionOnly2.html": "TIMED_OUT",
"dom/tests/mochitest/localstorage/test_localStorageReplace.html": "",
"dom/tests/mochitest/localstorage/test_removeOwnersAPI.html": "TIMED_OUT",
"dom/tests/mochitest/localstorage/test_removeOwnersAPISessionOnly.html": "TIMED_OUT",
"dom/tests/mochitest/pointerlock/test_pointerlock-api.html": "TIMED_OUT",
"dom/tests/mochitest/sessionstorage/test_sessionStorageClone.html": "",
"dom/tests/mochitest/sessionstorage/test_sessionStorageHttpHttps.html": "TIMED_OUT",
"dom/tests/mochitest/whatwg/test_bug500328.html": "TIMED_OUT",
"editor/composer/test/test_bug389350.html": "",
"editor/libeditor/base/tests/test_bug408231.html": "",
"editor/libeditor/base/tests/test_bug586662.html": "",
"editor/libeditor/html/tests/test_bug372345.html": "",
"editor/libeditor/html/tests/test_bug410986.html": "",
"editor/libeditor/html/tests/test_bug432225.html": "",
"editor/libeditor/html/tests/test_bug478725.html": "",
"editor/libeditor/html/tests/test_bug480972.html": "",
"editor/libeditor/html/tests/test_bug484181.html": "",
"editor/libeditor/html/tests/test_bug520189.html": "",
"editor/libeditor/html/tests/test_bug525389.html": "",
"editor/libeditor/html/tests/test_bug549262.html": "",
"editor/libeditor/html/tests/test_bug599322.html": "",
"editor/libeditor/html/tests/test_bug611182.html": "",
"editor/libeditor/html/tests/test_bug620906.html": "TIMED_OUT",
"editor/libeditor/html/tests/test_bug674770-1.html": "",
"editor/libeditor/html/tests/test_bug674770-2.html": "",
"editor/libeditor/html/tests/test_spellcheck_pref.html": "",
"editor/libeditor/text/tests/test_bug527935.html": "",
"editor/libeditor/text/tests/test_bug569988.html": "TIMED_OUT",
"editor/libeditor/text/tests/test_bug596333.html": "",
"editor/libeditor/text/tests/test_bug600570.html": "",
"editor/libeditor/text/tests/test_bug604532.html": "",
"editor/libeditor/text/tests/test_bug629172.html": "",
"editor/libeditor/text/tests/test_texteditor_keyevent_handling.html": "",
"embedding/test/test_bug449141.html": "",
"embedding/test/test_window_open_units.html": "",
"js/jsd/test/test_bug507448.html": "TIMED_OUT",
"js/jsd/test/test_bug617870-callhooks.html": "TIMED_OUT",
"layout/base/tests/test_bug332655-1.html": "",
"layout/base/tests/test_bug603550.html": "TIMED_OUT",
"layout/base/tests/test_bug629838.html": "",
"layout/base/tests/test_flush_on_paint.html": "",
"layout/base/tests/test_mozPaintCount.html": "",
"layout/base/tests/test_reftests_with_caret.html": "",
"layout/forms/test/test_bug348236.html": "",
"layout/forms/test/test_bug378670.html": "TIMED_OUT",
"layout/forms/test/test_bug446663.html": "",
"layout/forms/test/test_bug478219.xhtml": "",
"layout/forms/test/test_bug564115.html": "TIMED_OUT",
"layout/forms/test/test_bug571352.html": "TIMED_OUT",
"layout/forms/test/test_bug572649.html": "TIMED_OUT",
"layout/forms/test/test_bug644542.html": "TIMED_OUT",
"layout/forms/test/test_bug672810.html": "",
"layout/forms/test/test_textarea_resize.html": "",
"layout/generic/test/test_bug496275.html": "CRASH_DUMP",
"layout/generic/test/test_bug503813.html": "CRASH_DUMP",
"layout/generic/test/test_bug514732.html": "CRASH_DUMP",
"layout/generic/test/test_invalidate_during_plugin_paint.html": "",
"layout/generic/test/test_plugin_mouse_coords.html": "",
"layout/generic": "CRASH_DUMP, RANDOM, ONLY IN CHUNK 10",
"layout/style/test/test_animations.html": "",
"layout/style/test/test_bug379440.html": "",
"layout/style/test/test_compute_data_with_start_struct.html": "",
"layout/style/test/test_inherit_computation.html": "",
"layout/style/test/test_initial_computation.html": "",
"layout/style/test/test_value_computation.html": "",
"layout/style/test/test_visited_image_loading.html": "TIMED_OUT",
"layout/style/test/test_visited_image_loading_empty.html": "TIMED_OUT",
"layout/style/test/test_visited_lying.html": "",
"layout/style/test/test_visited_pref.html": "TIMED_OUT",
"layout/style/test/test_visited_reftests.html": "TIMED_OUT",
"parser/htmlparser/tests/mochitest/test_html5_tree_construction.html": "TIMED_OUT",
"parser/htmlparser/tests/mochitest/test_html5_tree_construction_part2.html": "TIMED_OUT",
"robocop": "TIMED_OUT",
"security/ssl/bugs/test_bug480509.html": "",
"security/ssl/bugs/test_bug483440.html": "",
"security/ssl/bugs/test_bug484111.html": "",
"security/ssl/mixedcontent": "TIMED_OUT",
"security/ssl/stricttransportsecurity/test_stricttransportsecurity.html": "TIMED_OUT",
"security/ssl/stricttransportsecurity/test_sts_privatebrowsing.html": "TIMED_OUT",
"toolkit/components/alerts/test/test_alerts.html": "",
"toolkit/components/passwordmgr/test/test_basic_form_autocomplete.html": "",
"toolkit/components/passwordmgr/test/test_master_password.html": "TIMED_OUT",
"toolkit/components/passwordmgr/test/test_maxforms_1.html": "TIMED_OUT",
"toolkit/components/passwordmgr/test/test_maxforms_2.html": "TIMED_OUT",
"toolkit/components/passwordmgr/test/test_maxforms_3.html": "TIMED_OUT",
"toolkit/components/passwordmgr/test/test_bug_627616.html": "TIMED_OUT",
"toolkit/components/passwordmgr/test/test_master_password_cleanup.html": "",
"toolkit/components/passwordmgr/test/test_notifications.html": "",
"toolkit/components/passwordmgr/test/test_prompt.html": "TIMED_OUT",
"toolkit/components/passwordmgr/test/test_prompt_async.html": "TIMED_OUT",
"toolkit/components/passwordmgr/test/test_xhr.html": "TIMED_OUT",
"toolkit/components/passwordmgr/test/test_xml_load.html": "TIMED_OUT",
"toolkit/components/places/tests/test_bug_411966.html": "RANDOM",
"toolkit/components/prompts/test/test_bug620145.html": "TIMED_OUT",
"toolkit/components/prompts/test/test_modal_prompts.html": "TIMED_OUT",
"toolkit/components/prompts/test/test_modal_select.html": "TIMED_OUT",
"toolkit/components/satchel/test/test_bug_511615.html": "",
"toolkit/components/satchel/test/test_form_autocomplete.html": "TIMED_OUT",
"toolkit/components/satchel/test/test_form_autocomplete_with_list.html": "",
"toolkit/components/satchel/test/test_form_submission.html": "",
"toolkit/components/satchel/test/test_form_submission_cap.html": "",
"toolkit/components/satchel/test/test_form_submission_cap2.html": "",
"toolkit/content/tests/widgets/test_audiocontrols_dimensions.html": "",
"toolkit/content/tests/widgets/test_contextmenu_nested.xul": "",
"toolkit/content/tests/widgets/test_menubar.xul": "W/SharedBufferStack(21799): waitForCondition(LockCondition) timed out (identity=34, status=0). CPU may be pegged. trying again",
"toolkit/content/tests/widgets/test_videocontrols.html": "TIMED_OUT",
"uriloader/exthandler/tests/mochitest/test_handlerApps.xhtml": "",
"dom/tests/mochitest/ajax/offline": "SLOW_DIRECTORY",
"layout/base/tests": "SLOW_DIRECTORY"
}
}

View File

@ -205,14 +205,19 @@ class MochitestOptions(optparse.OptionParser):
self.add_option("--run-only-tests",
action = "store", type="string", dest = "runOnlyTests",
help = "JSON list of tests that we only want to run, cannot be specified with --exclude-tests.")
help = "JSON list of tests that we only want to run, cannot be specified with --exclude-tests. [DEPRECATED- please use --test-manifest]")
defaults["runOnlyTests"] = None
self.add_option("--exclude-tests",
action = "store", type="string", dest = "excludeTests",
help = "JSON list of tests that we want to not run, cannot be specified with --run-only-tests.")
help = "JSON list of tests that we want to not run, cannot be specified with --run-only-tests. [DEPRECATED- please use --test-manifest]")
defaults["excludeTests"] = None
self.add_option("--test-manifest",
action = "store", type="string", dest = "testManifest",
help = "JSON list of tests to specify 'runtests' and 'excludetests'.")
defaults["testManifest"] = None
self.add_option("--failure-file",
action = "store", type="string", dest = "failureFile",
help = "Filename of the output file where we can store a .json list of failures to be run in the future with --run-only-tests.")
@ -282,15 +287,22 @@ See <http://mochikit.com/doc/html/MochiKit/Logging.html> for details on the logg
mochitest.vmwareHelperPath)
if options.runOnlyTests != None and options.excludeTests != None:
self.error("We can only support --run-only-tests OR --exclude-tests, not both.")
self.error("We can only support --run-only-tests OR --exclude-tests, not both. Please consider using --test-manifest instead.")
if options.testManifest != None and (options.runOnlyTests != None or options.excludeTests != None):
self.error("Please use --test-manifest only and not --run-only-tests or --exclude-tests.")
if options.runOnlyTests:
if not os.path.exists(os.path.abspath(options.runOnlyTests)):
self.error("unable to find --run-only-tests file '%s'" % options.runOnlyTests);
options.testManifest = options.runOnlyTests
options.runOnly = True
if options.excludeTests:
if not os.path.exists(os.path.abspath(options.excludeTests)):
self.error("unable to find --exclude-tests file '%s'" % options.excludeTests);
options.testManifest = options.excludeTests
options.runOnly = False
return options
@ -562,12 +574,14 @@ class Mochitest(object):
self.urlOpts.append("repeat=%d" % options.repeat)
if os.path.isfile(os.path.join(self.oldcwd, os.path.dirname(__file__), self.TEST_PATH, options.testPath)) and options.repeat > 0:
self.urlOpts.append("testname=%s" % ("/").join([self.TEST_PATH, options.testPath]))
if options.runOnlyTests:
self.urlOpts.append("runOnlyTests=%s" % options.runOnlyTests)
if options.testManifest:
self.urlOpts.append("testManifest=%s" % options.testManifest)
if options.runOnly:
self.urlOpts.append("runOnly=true")
else:
self.urlOpts.append("runOnly=false")
if options.failureFile:
self.urlOpts.append("failureFile=%s" % options.failureFile)
elif options.excludeTests:
self.urlOpts.append("excludeTests=%s" % options.excludeTests)
def cleanup(self, manifest, options):
""" remove temporary files and profile """

View File

@ -109,7 +109,7 @@ var RunSet = {}
RunSet.runall = function(e) {
// Filter tests to include|exclude tests based on data in params.filter.
// This allows for including or excluding tests from the gTestList
gTestList = filterTests(params.runOnlyTests, params.excludeTests);
gTestList = filterTests(params.testManifest, params.runOnly);
// Which tests we're going to run
var my_tests = gTestList;
@ -193,15 +193,11 @@ RunSet.reloadAndRunAll = function(e) {
// Open the file referenced by runOnly|exclude and use that to compare against
// gTestList. Return a modified version of gTestList
function filterTests(runOnly, exclude) {
function filterTests(filterFile, runOnly) {
var filteredTests = [];
var filterFile = null;
if (runOnly) {
filterFile = runOnly;
} else if (exclude) {
filterFile = exclude;
}
var removedTests = [];
var runtests = {};
var excludetests = {};
if (filterFile == null)
return gTestList;
@ -216,33 +212,60 @@ function filterTests(runOnly, exclude) {
dump("INFO | setup.js | error loading or parsing '" + datafile + "'\n");
return gTestList;
}
if ('runtests' in filter) {
runtests = filter.runtests;
}
if ('excludetests' in filter)
excludetests = filter.excludetests;
if (!('runtests' in filter) && !('excludetests' in filter)) {
if (runOnly == 'true') {
runtests = filter;
} else
excludetests = filter;
}
//Filter out 'exclude tests' from gTestList
for (var i = 0; i < gTestList.length; ++i) {
var test_path = gTestList[i];
//We use tmp_path to remove leading '/'
var tmp_path = test_path.replace(/^\//, '');
var found = false;
var test_path = gTestList[i];
var tmp_path = test_path.replace(/^\//, '');
for (var f in excludetests) {
// Remove leading /tests/ if exists
file = f.replace(/^\//, '')
file = file.replace(/^tests\//, '')
// Match directory or filename, gTestList has tests/<path>
if (tmp_path.match("^tests/" + file) != null) {
found = true;
break;
}
}
if (!found)
removedTests.push(test_path);
}
for (var f in filter) {
if (JSON.stringify(runtests) == "{}") {
return removedTests;
}
for (var i = 0; i < removedTests.length; ++i) {
var found = false;
var test_path = gTestList[i];
var tmp_path = test_path.replace(/^\//, '');
for (var f in runtests) {
// Remove leading /tests/ if exists
file = f.replace(/^\//, '')
file = file.replace(/^tests\//, '')
// Match directory or filename, gTestList has tests/<path>
if (tmp_path.match("^tests/" + file) != null) {
if (runOnly)
filteredTests.push(test_path);
filteredTests.push(test_path);
found = true;
break;
}
}
if (exclude && !found)
filteredTests.push(test_path);
}
return filteredTests;
}