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

Bug 1582662 - Fix xpcshell test suites against artifact builds on try. r=chmanchester

Browse Source 
Bug 1580996 cleaned up handling of `{application,platform}.ini` but
inadvertently populated `.ini` files from test archives into the
object directory.  That causes issues, especially on try.  Test INI
files should come from the local artifact build and not from the
upstream test archives.

Rather than re-instate the test at the time when processed test
archives are _unpacked_, the test is done as test archives are
packed/processed.

Differential Revision: https://phabricator.services.mozilla.com/D46862

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Nick Alexander 2019-09-23 21:47:42 +00:00
parent 8c24c04c6c
commit 458fa264fe
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
python/mozbuild/mozbuild/artifacts.py
View File

@ -233,6 +233,15 @@ class ArtifactJob(object):
writer.add(destpath.encode('utf-8'), reader[filename], mode=mode)
added_entry = True
break
if filename.endswith('.ini'):
# The artifact build writes test .ini files into the object
# directory; they don't come from the upstream test archive.
self.log(logging.INFO, 'artifact',
{'filename': filename},
'Skipping test INI file {filename}')
continue
for files_entry in OBJDIR_TEST_FILES.values():
origin_pattern = files_entry['pattern']
leaf_filename = filename
@ -270,6 +279,15 @@ class ArtifactJob(object):
writer.add(destpath.encode('utf-8'), entry.open(), mode=mode)
added_entry = True
break
if filename.endswith('.ini'):
# The artifact build writes test .ini files into the object
# directory; they don't come from the upstream test archive.
self.log(logging.INFO, 'artifact',
{'filename': filename},
'Skipping test INI file {filename}')
continue
for files_entry in OBJDIR_TEST_FILES.values():
origin_pattern = files_entry['pattern']
leaf_filename = filename