Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 939271 - Part j: move mochitests to manifests in widget/tests; r=roc

Browse Source
This commit is contained in:
Ms2ger 2013-11-28 15:04:21 +01:00
parent 6b9009565b
commit 11de6ce741
4 changed files with 99 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
widget/tests/Makefile.in
View File

@ -1,97 +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/.
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
ifdef NS_ENABLE_TSF
#Test disabled because it uses the internal string APIs incorrectly (see bug 582863)
#CPP_UNIT_TESTS += TestWinTSF.cpp \
# $(NULL)
endif
# Test disabled because it requires the internal API. Re-enabling this test is
# bug 652123.
#CPP_UNIT_TESTS += TestChromeMargin.cpp \
# $(NULL)
endif
MOCHITEST_CHROME_FILES = test_bug343416.xul \
test_bug429954.xul \
window_bug429954.xul \
test_bug444800.xul \
$(filter disabled-for-intermittent-timeouts--bug-561929, test_bug478536.xul) \
test_bug462106_perwindow.xul \
window_bug478536.xul \
test_bug517396.xul \
test_bug538242.xul \
window_bug538242.xul \
test_bug593307.xul \
window_bug593307_offscreen.xul \
window_bug593307_centerscreen.xul \
test_keycodes.xul \
test_wheeltransaction.xul \
window_wheeltransaction.xul \
test_imestate.html \
window_imestate_iframes.html \
test_plugin_scroll_consistency.html \
test_composition_text_querycontent.xul \
window_composition_text_querycontent.xul \
test_input_events_on_deactive_window.xul \
test_position_on_resize.xul \
empty_window.xul \
test_sizemode_events.xul \
test_bug760802.xul \
test_assign_event_data.html \
$(NULL)
# test_bug413277.html mac-only based on 604789, 605178
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
MOCHITEST_CHROME_FILES += native_menus_window.xul \
test_native_menus.xul \
native_mouse_mac_window.xul \
test_native_mouse_mac.xul \
test_bug413277.html \
test_bug428405.xul \
test_bug466599.xul \
test_bug485118.xul \
test_bug522217.xul \
window_bug522217.xul \
test_platform_colors.xul \
test_standalone_native_menu.xul \
standalone_native_menu_window.xul \
test_bug586713.xul \
bug586713_window.xul \
test_key_event_counts.xul \
test_bug596600.xul \
test_bug673301.xul \
test_taskbar_progress.xul \
test_secure_input.html \
test_native_key_bindings_mac.html \
$(NULL)
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
MOCHITEST_CHROME_FILES += taskbar_previews.xul \
window_state_windows.xul \
$(warning test_taskbar_progress.xul disabled due to regression, see bug 605813) \
test_chrome_context_menus_win.xul \
test_plugin_input_event.html \
chrome_context_menus_win.xul \
test_mouse_scroll.xul \
window_mouse_scroll_win.html \
$(NULL)
MOCHITEST_FILES += test_bug565392.html \
test_picker_no_crash.html \
window_picker_no_crash_child.html \
$(NULL)
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
MOCHITEST_FILES += plugin_scroll_invalidation.html \
test_plugin_scroll_invalidation.html \
$(NULL)
endif

80
widget/tests/chrome.ini Normal file
View File

@ -0,0 +1,80 @@
[DEFAULT]
support-files = empty_window.xul
[test_bug343416.xul]
[test_bug429954.xul]
support-files = window_bug429954.xul
[test_bug444800.xul]
[test_bug478536.xul]
skip-if = true # Bug 561929
support-files = window_bug478536.xul
[test_bug462106_perwindow.xul]
[test_bug517396.xul]
[test_bug538242.xul]
support-files = window_bug538242.xul
[test_bug593307.xul]
support-files = window_bug593307_offscreen.xul window_bug593307_centerscreen.xul
[test_keycodes.xul]
[test_wheeltransaction.xul]
support-files = window_wheeltransaction.xul
[test_imestate.html]
support-files = window_imestate_iframes.html
[test_plugin_scroll_consistency.html]
[test_composition_text_querycontent.xul]
support-files = window_composition_text_querycontent.xul
[test_input_events_on_deactive_window.xul]
[test_position_on_resize.xul]
[test_sizemode_events.xul]
[test_bug760802.xul]
[test_assign_event_data.html]
# Cocoa
[test_native_menus.xul]
skip-if = toolkit != "cocoa"
support-files = native_menus_window.xul
[test_native_mouse_mac.xul]
skip-if = toolkit != "cocoa"
support-files = native_mouse_mac_window.xul
[test_bug413277.html]
skip-if = toolkit != "cocoa"
[test_bug428405.xul]
skip-if = toolkit != "cocoa"
[test_bug466599.xul]
skip-if = toolkit != "cocoa"
[test_bug485118.xul]
skip-if = toolkit != "cocoa"
[test_bug522217.xul]
skip-if = toolkit != "cocoa"
support-files = window_bug522217.xul
[test_platform_colors.xul]
skip-if = toolkit != "cocoa"
[test_standalone_native_menu.xul]
skip-if = toolkit != "cocoa"
support-files = standalone_native_menu_window.xul
[test_bug586713.xul]
skip-if = toolkit != "cocoa"
support-files = bug586713_window.xul
[test_key_event_counts.xul]
skip-if = toolkit != "cocoa"
[test_bug596600.xul]
skip-if = toolkit != "cocoa"
[test_bug673301.xul]
skip-if = toolkit != "cocoa"
[test_taskbar_progress.xul]
skip-if = toolkit != "cocoa"
[test_secure_input.html]
skip-if = toolkit != "cocoa"
[test_native_key_bindings_mac.html]
skip-if = toolkit != "cocoa"
# Windows
# taskbar_previews.xul
# window_state_windows.xul
[test_chrome_context_menus_win.xul]
skip-if = toolkit != "windows"
support-files = chrome_context_menus_win.xul
[test_plugin_input_event.html]
skip-if = toolkit != "windows"
[test_mouse_scroll.xul]
skip-if = toolkit != "windows"
support-files = window_mouse_scroll_win.html

8
widget/tests/mochitest.ini Normal file
View File

@ -0,0 +1,8 @@
[test_bug565392.html]
skip-if = toolkit != "windows"
[test_picker_no_crash.html]
skip-if = toolkit != "windows"
support-files = window_picker_no_crash_child.html
[test_plugin_scroll_invalidation.html]
skip-if = toolkit != "gtk2"
support-files = plugin_scroll_invalidation.html

11
widget/tests/moz.build
View File

@ -5,6 +5,8 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
MOCHITEST_MANIFESTS += ['mochitest.ini']
MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
CPP_UNIT_TESTS += [
'TestAppShellSteadyState.cpp',
@ -12,3 +14,12 @@ CPP_UNIT_TESTS += [
FAIL_ON_WARNINGS = True
# if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
# if CONFIG['NS_ENABLE_TSF']:
# Test disabled because it uses the internal string APIs incorrectly
# (see bug 582863)
# CPP_UNIT_TESTS += ['TestWinTSF.cpp']
#
# Test disabled because it requires the internal API. Re-enabling this test
# is bug 652123.
# CPP_UNIT_TESTS += ['TestChromeMargin.cpp']