wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 923273 - Convert MOCHITEST_METRO_FILES to manifests [r=gps,rsilveira]

Browse Source 
--HG--
rename : browser/metro/base/tests/mochiperf/perfhelpers.js => browser/metro/base/tests/mochiperf/head.js
This commit is contained in:
Matt Brubeck 2013-10-08 14:19:06 -07:00
parent a9d4ba644c
commit c5f3d79040
25 changed files with 118 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
browser/metro/base/tests/mochiperf/Makefile.in
View File

@ -1,17 +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/.
ifndef MOZ_DEBUG
MOCHITEST_METRO_FILES = \
../mochitest/head.js \
perfhelpers.js \
browser_miscgfx_01.js \
browser_tabs_01.js \
browser_deck_01.js \
browser_msgmgr_01.js \
msgmanagerecho.js \
browser_layers_01.js \
browser_firstx.js \
$(NULL)
endif

2
browser/metro/base/tests/mochiperf/browser_deck_01.js
View File

@ -4,8 +4,6 @@
"use strict";
function test() {
let testDir = gTestPath.substr(0, gTestPath.lastIndexOf("/"));
Services.scriptloader.loadSubScript(testDir + "/perfhelpers.js", this);
runTests();
}

2
browser/metro/base/tests/mochiperf/browser_firstx.js
View File

@ -4,8 +4,6 @@
"use strict";
function test() {
let testDir = gTestPath.substr(0, gTestPath.lastIndexOf("/"));
Services.scriptloader.loadSubScript(testDir + "/perfhelpers.js", this);
runTests();
}

2
browser/metro/base/tests/mochiperf/browser_layers_01.js
View File

@ -4,8 +4,6 @@
"use strict";
function test() {
let testDir = gTestPath.substr(0, gTestPath.lastIndexOf("/"));
Services.scriptloader.loadSubScript(testDir + "/perfhelpers.js", this);
runTests();
}

2
browser/metro/base/tests/mochiperf/browser_miscgfx_01.js
View File

@ -4,8 +4,6 @@
"use strict";
function test() {
let testDir = gTestPath.substr(0, gTestPath.lastIndexOf("/"));
Services.scriptloader.loadSubScript(testDir + "/perfhelpers.js", this);
requestLongerTimeout(2);
runTests();
}

2
browser/metro/base/tests/mochiperf/browser_msgmgr_01.js
View File

@ -4,8 +4,6 @@
"use strict";
function test() {
let testDir = gTestPath.substr(0, gTestPath.lastIndexOf("/"));
Services.scriptloader.loadSubScript(testDir + "/perfhelpers.js", this);
runTests();
}

2
browser/metro/base/tests/mochiperf/browser_tabs_01.js
View File

@ -4,8 +4,6 @@
"use strict";
function test() {
let testDir = gTestPath.substr(0, gTestPath.lastIndexOf("/"));
Services.scriptloader.loadSubScript(testDir + "/perfhelpers.js", this);
runTests();
}

4
browser/metro/base/tests/mochiperf/perfhelpers.js → browser/metro/base/tests/mochiperf/head.js
View File

@ -3,6 +3,10 @@
"use strict";
// Load common code from ../mochitest/head.js
let mochitestDir = getRootDirectory(gTestPath).replace('/mochiperf', '/mochitest');
Services.scriptloader.loadSubScript(mochitestDir + "head.js", this);
// Misc. constants
const kInfoHeader = "PERF-TEST | ";
const kDeclareId = "DECLARE ";

19
browser/metro/base/tests/mochiperf/metro.ini Normal file
View File

@ -0,0 +1,19 @@
[DEFAULT]
# Don't run performance tests in debug builds.
skip-if = debug
support-files =
head.js
msgmanagerecho.js
res/ripples.html
res/scroll_test.html
res/tidevideo.html
res/tide.mp4
res/divs_test.html
res/fx.png
[browser_miscgfx_01.js]
[browser_tabs_01.js]
[browser_deck_01.js]
[browser_msgmgr_01.js]
[browser_layers_01.js]
[browser_firstx.js]

6
browser/metro/base/tests/mochiperf/moz.build
View File

@ -1,6 +0,0 @@
# vim: set filetype=python:
# 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_DIRS += ['res']

14
browser/metro/base/tests/mochiperf/res/Makefile.in
View File

@ -1,14 +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/.
ifndef MOZ_DEBUG
MOCHITEST_METRO_FILES = \
ripples.html \
scroll_test.html \
tidevideo.html \
tide.mp4 \
divs_test.html \
fx.png \
$(NULL)
endif

4
browser/metro/base/tests/mochiperf/res/moz.build
View File

@ -1,4 +0,0 @@
# vim: set filetype=python:
# 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/.

63
browser/metro/base/tests/mochitest/Makefile.in
View File

@ -1,63 +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/.
MOCHITEST_METRO_FILES = \
head.js \
helpers/BookmarksHelper.js \
helpers/HistoryHelper.js \
helpers/ViewStateHelper.js \
browser_bookmarks.js \
browser_canonizeURL.js \
browser_circular_progress_indicator.js \
browser_crashprompt.js \
browser_context_menu_tests.js \
browser_context_menu_tests_01.html \
browser_context_menu_tests_02.html \
browser_context_menu_tests_03.html \
browser_context_menu_tests_04.html \
browser_context_ui.js \
browser_downloads.js \
browser_findbar.js \
browser_findbar.html \
browser_form_auto_complete.js \
browser_form_auto_complete.html \
browser_history.js \
browser_inputsource.js \
browser_onscreen_keyboard.js \
browser_onscreen_keyboard.html \
browser_prefs_ui.js \
browser_progress_indicator.xul \
browser_remotetabs.js \
browser_snappedState.js \
browser_tabs.js \
browser_test.js \
browser_tiles.js \
browser_tilegrid.xul \
browser_topsites.js \
browser_urlbar.js \
browser_urlbar_highlightURLs.js \
browser_urlbar_trimURLs.js \
$(NULL)
ifndef MOZ_DEBUG
MOCHITEST_METRO_FILES += \
browser_selection_basic.js \
browser_selection_basic.html \
browser_selection_textarea.js \
browser_selection_textarea.html \
browser_selection_frame_content.js \
browser_selection_frame_content.html \
browser_selection_inputs.js \
browser_selection_inputs.html \
browser_selection_frame_textarea.js \
browser_selection_frame_textarea.html \
browser_selection_frame_inputs.js \
browser_selection_frame_inputs.html \
browser_selection_urlbar.js \
browser_selection_contenteditable.js \
browser_selection_contenteditable.html \
browser_selection_caretfocus.js \
browser_selection_caretfocus.html \
$(NULL)
endif

6
browser/metro/base/tests/mochitest/head.js
View File

@ -34,9 +34,9 @@ splitPath.push('mochitest');
const mochitestPath = splitPath.join('/') + '/';
[
"BookmarksHelper.js",
"HistoryHelper.js",
"ViewStateHelper.js"
"helpers/BookmarksHelper.js",
"helpers/HistoryHelper.js",
"helpers/ViewStateHelper.js"
].forEach(function(lib) {
Services.scriptloader.loadSubScript(mochitestPath + lib, this);
}, this);

74
browser/metro/base/tests/mochitest/metro.ini Normal file
View File

@ -0,0 +1,74 @@
[DEFAULT]
support-files =
browser_context_menu_tests_01.html
browser_context_menu_tests_02.html
browser_context_menu_tests_03.html
browser_context_menu_tests_04.html
browser_findbar.html
browser_form_auto_complete.html
browser_onscreen_keyboard.html
browser_progress_indicator.xul
browser_selection_basic.html
browser_selection_caretfocus.html
browser_selection_contenteditable.html
browser_selection_frame_content.html
browser_selection_frame_inputs.html
browser_selection_frame_textarea.html
browser_selection_inputs.html
browser_selection_textarea.html
browser_tilegrid.xul
head.js
helpers/BookmarksHelper.js
helpers/HistoryHelper.js
helpers/ViewStateHelper.js
res/image01.png
res/textblock01.html
res/textinput01.html
res/textarea01.html
res/testEngine.xml
res/blankpage1.html
res/blankpage2.html
res/blankpage3.html
[browser_bookmarks.js]
[browser_canonizeURL.js]
[browser_circular_progress_indicator.js]
[browser_crashprompt.js]
[browser_context_menu_tests.js]
[browser_context_ui.js]
[browser_downloads.js]
[browser_findbar.js]
[browser_form_auto_complete.js]
[browser_history.js]
[browser_inputsource.js]
[browser_onscreen_keyboard.js]
[browser_prefs_ui.js]
[browser_remotetabs.js]
[browser_snappedState.js]
[browser_tabs.js]
[browser_test.js]
[browser_tiles.js]
[browser_topsites.js]
[browser_urlbar.js]
[browser_urlbar_highlightURLs.js]
[browser_urlbar_trimURLs.js]
# These tests have known failures in debug builds
[browser_selection_basic.js]
skip-if = debug
[browser_selection_textarea.js]
skip-if = debug
[browser_selection_frame_content.js]
skip-if = debug
[browser_selection_inputs.js]
skip-if = debug
[browser_selection_frame_textarea.js]
skip-if = debug
[browser_selection_frame_inputs.js]
skip-if = debug
[browser_selection_urlbar.js]
skip-if = debug
[browser_selection_contenteditable.js]
skip-if = debug
[browser_selection_caretfocus.js]
skip-if = debug

6
browser/metro/base/tests/mochitest/moz.build
View File

@ -1,6 +0,0 @@
# vim: set filetype=python:
# 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_DIRS += ['res']

14
browser/metro/base/tests/mochitest/res/Makefile.in
View File

@ -1,14 +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/.
MOCHITEST_METRO_FILES = \
image01.png \
textblock01.html \
textinput01.html \
textarea01.html \
testEngine.xml \
blankpage1.html \
blankpage2.html \
blankpage3.html \
$(NULL)

4
browser/metro/base/tests/mochitest/res/moz.build
View File

@ -1,4 +0,0 @@
# vim: set filetype=python:
# 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/.

4
browser/metro/base/tests/moz.build
View File

@ -4,7 +4,5 @@
# 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_DIRS += ['mochitest']
TEST_DIRS += ['mochiperf']
METRO_CHROME_MANIFESTS += ['mochiperf/metro.ini', 'mochitest/metro.ini']
XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']

1
python/mozbuild/mozbuild/frontend/emitter.py
View File

@ -228,6 +228,7 @@ class TreeMetadataEmitter(LoggingMixin):
test_manifests = dict(
A11Y=('a11y', 'testing/mochitest/a11y', True),
BROWSER_CHROME=('browser-chrome', 'testing/mochitest/browser', True),
METRO_CHROME=('metro-chrome', 'testing/mochitest/metro', True),
MOCHITEST=('mochitest', 'testing/mochitest/tests', True),
MOCHITEST_CHROME=('chrome', 'testing/mochitest/chrome', True),
WEBRTC_SIGNALLING_TEST=('steeplechase', 'steeplechase', True),

4
python/mozbuild/mozbuild/frontend/sandbox_symbols.py
View File

@ -477,6 +477,10 @@ VARIABLES = {
"""List of manifest files defining browser chrome tests.
""", None),
'METRO_CHROME_MANIFESTS': (StrictOrderingOnAppendList, list, [],
"""List of manifest files defining metro browser chrome tests.
""", None),
'MOCHITEST_MANIFESTS': (StrictOrderingOnAppendList, list, [],
"""List of manifest files defining mochitest tests.
""", None),

3
python/mozbuild/mozbuild/test/frontend/data/test-manifest-keys-extracted/metro.ini Normal file
View File

@ -0,0 +1,3 @@
[DEFAULT]
[test_metro.js]

1
python/mozbuild/mozbuild/test/frontend/data/test-manifest-keys-extracted/moz.build
View File

@ -3,6 +3,7 @@
A11Y_MANIFESTS += ['a11y.ini']
BROWSER_CHROME_MANIFESTS += ['browser.ini']
METRO_CHROME_MANIFESTS += ['metro.ini']
MOCHITEST_MANIFESTS += ['mochitest.ini']
MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
XPCSHELL_TESTS_MANIFESTS += ['xpcshell.ini']

0
python/mozbuild/mozbuild/test/frontend/data/test-manifest-keys-extracted/test_metro.js Normal file
View File

9
python/mozbuild/mozbuild/test/frontend/test_emitter.py
View File

@ -241,7 +241,7 @@ class TestEmitterBasic(unittest.TestCase):
objs = [o for o in self.read_topsrcdir(reader)
if isinstance(o, TestManifest)]
self.assertEqual(len(objs), 5)
self.assertEqual(len(objs), 6)
metadata = {
'a11y.ini': {
@ -263,6 +263,13 @@ class TestEmitterBasic(unittest.TestCase):
'support2',
},
},
'metro.ini': {
'flavor': 'metro-chrome',
'installs': {
'metro.ini',
'test_metro.js',
},
},
'mochitest.ini': {
'flavor': 'mochitest',
'installs': {