зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1143218 - Use mochitest subsuites to specify webgl tests. r=jmaher,gbrown
This commit is contained in:
Родитель
1c1b022893
Коммит
5da1c39c61
|
@ -4,6 +4,7 @@
|
||||||
# Mark failing tests in mochi-single.html.
|
# Mark failing tests in mochi-single.html.
|
||||||
|
|
||||||
[DEFAULT]
|
[DEFAULT]
|
||||||
|
subsuite = webgl
|
||||||
skip-if = e10s || os == 'b2g' || ((os == 'linux') && (buildapp == 'b2g')) || ((os == 'linux') && (buildapp == 'mulet'))
|
skip-if = e10s || os == 'b2g' || ((os == 'linux') && (buildapp == 'b2g')) || ((os == 'linux') && (buildapp == 'mulet'))
|
||||||
|
|
||||||
support-files = webgl-conformance/../webgl-mochitest/driver-info.js
|
support-files = webgl-conformance/../webgl-mochitest/driver-info.js
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
[DEFAULT]
|
[DEFAULT]
|
||||||
|
subsuite = webgl
|
||||||
|
|
||||||
[include:_webgl-conformance.ini]
|
[include:_webgl-conformance.ini]
|
||||||
[include:webgl-mochitest.ini]
|
[include:webgl-mochitest.ini]
|
||||||
|
|
|
@ -30,8 +30,9 @@ EXTRA_SUPPORT_FILES = [
|
||||||
]
|
]
|
||||||
|
|
||||||
ACCEPTABLE_ERRATA_KEYS = set([
|
ACCEPTABLE_ERRATA_KEYS = set([
|
||||||
'skip-if',
|
|
||||||
'fail-if',
|
'fail-if',
|
||||||
|
'skip-if',
|
||||||
|
'subsuite',
|
||||||
])
|
])
|
||||||
|
|
||||||
GENERATED_HEADER = '''
|
GENERATED_HEADER = '''
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
# See python/mozbuild/mozbuild/mozinfo.py for incoming data.
|
# See python/mozbuild/mozbuild/mozinfo.py for incoming data.
|
||||||
|
|
||||||
[DEFAULT]
|
[DEFAULT]
|
||||||
|
subsuite = webgl
|
||||||
# No e10s yet.
|
# No e10s yet.
|
||||||
# 'B2G Desktop Linux' fails to create WebGL contexts.
|
# 'B2G Desktop Linux' fails to create WebGL contexts.
|
||||||
# Also skip B2G for now, until we get a handle on the longer tail of emulator
|
# Also skip B2G for now, until we get a handle on the longer tail of emulator
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
[DEFAULT]
|
[DEFAULT]
|
||||||
|
subsuite = webgl
|
||||||
skip-if = ((os == 'linux') && (buildapp == 'b2g'))
|
skip-if = ((os == 'linux') && (buildapp == 'b2g'))
|
||||||
|
|
||||||
support-files =
|
support-files =
|
||||||
|
|
|
@ -25,8 +25,8 @@ config = {
|
||||||
"--http-port=%(http_port)s", "--ssl-port=%(ssl_port)s",
|
"--http-port=%(http_port)s", "--ssl-port=%(ssl_port)s",
|
||||||
"--certificate-path=%(certs_path)s", "--symbols-path=%(symbols_path)s",
|
"--certificate-path=%(certs_path)s", "--symbols-path=%(symbols_path)s",
|
||||||
"--quiet", "--log-raw=%(raw_log_file)s",
|
"--quiet", "--log-raw=%(raw_log_file)s",
|
||||||
"--total-chunks=2",
|
"--total-chunks=4",
|
||||||
"--manifest=tests/dom/canvas/test/_webgl-conformance.ini",
|
"--subsuite=webgl",
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
"robocop": {
|
"robocop": {
|
||||||
|
|
|
@ -28,7 +28,7 @@ config = {
|
||||||
"--certificate-path=%(certs_path)s", "--symbols-path=%(symbols_path)s",
|
"--certificate-path=%(certs_path)s", "--symbols-path=%(symbols_path)s",
|
||||||
"--quiet", "--log-raw=%(raw_log_file)s",
|
"--quiet", "--log-raw=%(raw_log_file)s",
|
||||||
"--total-chunks=4",
|
"--total-chunks=4",
|
||||||
"--manifest=tests/dom/canvas/test/_webgl-conformance.ini",
|
"--subsuite=webgl",
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
"robocop": {
|
"robocop": {
|
||||||
|
|
|
@ -580,9 +580,7 @@ class MochitestUtilsMixin(object):
|
||||||
if options.logFile:
|
if options.logFile:
|
||||||
options.logFile = self.getLogFilePath(options.logFile)
|
options.logFile = self.getLogFilePath(options.logFile)
|
||||||
|
|
||||||
# Note that all tests under options.subsuite need to be browser chrome
|
if options.browserChrome or options.chrome or \
|
||||||
# tests.
|
|
||||||
if options.browserChrome or options.chrome or options.subsuite or \
|
|
||||||
options.a11y or options.webapprtChrome or options.jetpackPackage or \
|
options.a11y or options.webapprtChrome or options.jetpackPackage or \
|
||||||
options.jetpackAddon:
|
options.jetpackAddon:
|
||||||
self.makeTestConfig(options)
|
self.makeTestConfig(options)
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{
|
{
|
||||||
"repo": "https://hg.mozilla.org/build/mozharness",
|
"repo": "https://hg.mozilla.org/build/mozharness",
|
||||||
"revision": "75c435ef19ca"
|
"revision": "7b5d3fcc48c6"
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче