Bug 932147 - Move remaining tests in browser/base/content/test/general/Makefile.in to manifest files. r=jhammel

This commit is contained in:
Mark Hammond 2013-11-06 11:18:45 +11:00
parent 3b8a1711d9
commit 9d28a47f46
3 changed files with 37 additions and 66 deletions

View File

@ -1,66 +0,0 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
# test_contextmenu.html and test_contextmenu_input are disabled on Linux due to bug 513558
ifndef MOZ_WIDGET_GTK
MOCHITEST_FILES += \
audio.ogg \
privateBrowsingMode.js \
subtst_contextmenu.html \
contextmenu_common.js \
test_contextmenu.html \
test_contextmenu_input.html \
$(NULL)
endif
# The following tests are disabled because they are unreliable:
# browser_bug423833.js is bug 428712
# browser_sanitize-download-history.js is bug 432425
#
# browser_sanitizeDialog_treeView.js is disabled until the tree view is added
# back to the clear recent history dialog (sanitize.xul), if it ever is (bug
# 480169)
# browser_drag.js is disabled, as it needs to be updated for the new behavior from bug 320638.
# browser_bug321000.js is disabled because newline handling is shaky (bug 592528)
# Disable tests on Windows due to frequent failures (bugs 825739, 841341)
ifneq (windows,$(MOZ_WIDGET_TOOLKIT))
MOCHITEST_BROWSER_FILES += \
browser_bookmark_titles.js \
browser_popupNotification.js \
$(NULL)
endif
ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT))
MOCHITEST_BROWSER_FILES += \
browser_bug462289.js \
$(NULL)
else
MOCHITEST_BROWSER_FILES += \
browser_bug565667.js \
$(NULL)
endif
ifdef MOZ_DATA_REPORTING
MOCHITEST_BROWSER_FILES += \
browser_datareporting_notification.js \
$(NULL)
endif
ifdef MOZ_CRASHREPORTER
MOCHITEST_BROWSER_FILES += \
browser_pluginCrashCommentAndURL.js \
pluginCrashCommentAndURL.html \
browser_CTP_crashreporting.js \
$(NULL)
endif
# browser_CTP_context_menu.js fails intermittently on Linux (bug 909342)
ifndef MOZ_WIDGET_GTK
MOCHITEST_BROWSER_FILES += \
browser_CTP_context_menu.js \
$(NULL)
endif

View File

@ -67,6 +67,7 @@ support-files =
plugin_test3.html
plugin_two_types.html
plugin_unknown.html
pluginCrashCommentAndURL.html
print_postdata.sjs
redirect_bug623155.sjs
test-mixedcontent-securityerrors.html
@ -85,6 +86,10 @@ support-files =
test_no_mcb_on_http_site_font2.html
test_no_mcb_on_http_site_font2.css
[browser_CTP_context_menu.js]
skip-if = toolkit == "gtk2" || toolkit == "gtk3" # browser_CTP_context_menu.js fails intermittently on Linux (bug 909342)
[browser_CTP_crashreporting.js]
run-if = crashreporter
[browser_CTP_data_urls.js]
[browser_CTP_drag_drop.js]
[browser_CTP_nonplugins.js]
@ -99,7 +104,11 @@ support-files =
[browser_addon_bar_shortcut.js]
[browser_alltabslistener.js]
[browser_blob-channelname.js]
[browser_bookmark_titles.js]
skip-if = toolkit == "windows" # Disabled on Windows due to frequent failures (bugs 825739, 841341)
[browser_bug304198.js]
[browser_bug321000.js]
skip-if = true # browser_bug321000.js is disabled because newline handling is shaky (bug 592528)
[browser_bug329212.js]
[browser_bug356571.js]
[browser_bug380960.js]
@ -113,6 +122,8 @@ support-files =
[browser_bug417483.js]
[browser_bug419612.js]
[browser_bug422590.js]
[browser_bug423833.js]
skip-if = true # bug 428712
[browser_bug424101.js]
[browser_bug427559.js]
[browser_bug432599.js]
@ -121,6 +132,8 @@ support-files =
[browser_bug441778.js]
[browser_bug455852.js]
[browser_bug460146.js]
[browser_bug462289.js]
skip-if = toolkit == "cocoa"
[browser_bug462673.js]
[browser_bug477014.js]
[browser_bug479408.js]
@ -147,6 +160,8 @@ support-files =
[browser_bug562649.js]
[browser_bug563588.js]
[browser_bug565575.js]
[browser_bug565667.js]
run-if = toolkit == "cocoa"
[browser_bug567306.js]
[browser_bug575561.js]
[browser_bug575830.js]
@ -218,9 +233,13 @@ support-files =
[browser_ctrlTab.js]
[browser_customize.js]
[browser_customize_popupNotification.js]
[browser_datareporting_notification.js]
run-if = datareporting
[browser_disablechrome.js]
[browser_discovery.js]
[browser_duplicateIDs.js]
[browser_drag.js]
skip-if = true # browser_drag.js is disabled, as it needs to be updated for the new behavior from bug 320638.
[browser_findbarClose.js]
[browser_fullscreen-window-open.js]
[browser_gestureSupport.js]
@ -247,16 +266,26 @@ support-files =
[browser_pluginnotification.js]
[browser_pluginplaypreview.js]
[browser_pluginplaypreview2.js]
[browser_pluginCrashCommentAndURL.js]
run-if = crashreporter
[browser_plugins_added_dynamically.js]
[browser_popupNotification.js]
skip-if = toolkit == "windows" # Disabled on Windows due to frequent failures (bugs 825739, 841341)
[browser_popupUI.js]
[browser_private_browsing_window.js]
[browser_private_no_prompt.js]
[browser_relatedTabs.js]
[browser_removeTabsToTheEnd.js]
[browser_sanitize-download-history.js]
skip-if = true # bug 432425
[browser_sanitize-passwordDisabledHosts.js]
[browser_sanitize-sitepermissions.js]
[browser_sanitize-timespans.js]
[browser_sanitizeDialog.js]
[browser_sanitizeDialog_treeView.js]
skip-if = true # disabled until the tree view is added
# back to the clear recent history dialog (sanitize.xul), if
# it ever is (bug 480169)
[browser_save_link-perwindowpb.js]
[browser_save_private_link_perwindowpb.js]
[browser_save_video.js]

View File

@ -1,8 +1,10 @@
[DEFAULT]
support-files =
audio.ogg
bug364677-data.xml
bug364677-data.xml^headers^
bug395533-data.txt
contextmenu_common.js
ctxmenu-image.png
feed_discovery.html
gZipOfflineChild.cacheManifest
@ -20,10 +22,16 @@ support-files =
offlineEvent.cacheManifest
offlineEvent.cacheManifest^headers^
offlineEvent.html
privateBrowsingMode.js
subtst_contextmenu.html
video.ogg
[test_bug364677.html]
[test_bug395533.html]
[test_contextmenu.html]
skip-if = toolkit == "gtk2" || toolkit == "gtk3" # disabled on Linux due to bug 513558
[test_contextmenu_input.html]
skip-if = toolkit == "gtk2" || toolkit == "gtk3" # disabled on Linux due to bug 513558
[test_feed_discovery.html]
[test_offlineNotification.html]
[test_offline_gzip.html]