mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 1173114 - Fallback to chunk-by-dir if runtimes file not found, r=ahal
This commit is contained in:
parent
b7a306fd2a
commit
1b75977b76
@ -1936,12 +1936,24 @@ class Mochitest(MochitestUtilsMixin):
|
||||
|
||||
# Add chunking filters if specified
|
||||
if options.totalChunks:
|
||||
if options.chunkByRuntime:
|
||||
runtime_file = self.resolve_runtime_file(options, info)
|
||||
if not os.path.exists(runtime_file):
|
||||
self.log.warning("runtime file %s not found; defaulting to chunk-by-dir" %
|
||||
runtime_file)
|
||||
options.chunkByRuntime = None
|
||||
flavor = self.getTestFlavor(options)
|
||||
if flavor in ('browser-chrome', 'devtools-chrome'):
|
||||
# these values match current mozharness configs
|
||||
options.chunkbyDir = 5
|
||||
else:
|
||||
options.chunkByDir = 4
|
||||
|
||||
if options.chunkByDir:
|
||||
filters.append(chunk_by_dir(options.thisChunk,
|
||||
options.totalChunks,
|
||||
options.chunkByDir))
|
||||
elif options.chunkByRuntime:
|
||||
runtime_file = self.resolve_runtime_file(options, info)
|
||||
with open(runtime_file, 'r') as f:
|
||||
runtime_data = json.loads(f.read())
|
||||
runtimes = runtime_data['runtimes']
|
||||
|
Loading…
Reference in New Issue
Block a user