Backed out changeset 89e2853bf0e8 (bug 1330421)
authorSebastian Hengst <archaeopteryx@coole-files.de>
Mon, 30 Jan 2017 20:25:32 +0100
changeset 331681 baf39ca711ce6394bf5d0c5029ba1ed48f058bb3
parent 331680 f6895ed1367c698cd60af71084f68950cdb2e630
child 331682 d434f525133357141b5c5d87fb5433f6d871a6dc
push id31280
push userkwierso@gmail.com
push dateMon, 30 Jan 2017 23:22:12 +0000
treeherdermozilla-central@2b11b3e60ca6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1330421
milestone54.0a1
backs out89e2853bf0e8f520ac17d566bca20386c67fb339
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 89e2853bf0e8 (bug 1330421)
Makefile.in
python/mozbuild/mozbuild/artifacts.py
--- a/Makefile.in
+++ b/Makefile.in
@@ -159,22 +159,16 @@ tup:
 # js as standalone because automated builds are building nspr separately and
 # that would remove the resulting files.
 # Eventually, a standalone js build would just be able to build nspr itself,
 # removing the need for the former.
 ifdef JS_STANDALONE
 NO_REMOVE=1
 endif
 
-# For an artifact build, _tests will already be partly populated, so run
-# this install manifest with NO_REMOVE set in this case.
-ifdef MOZ_ARTIFACT_BUILDS
-install-_tests: NO_REMOVE=1
-endif
-
 .PHONY: $(addprefix install-,$(subst /,_,$(install_manifests)))
 $(addprefix install-,$(install_manifests)): install-%: $(install_manifest_depends)
 ifneq (,$(filter FasterMake+RecursiveMake,$(BUILD_BACKENDS)))
 	@# If we're using the hybrid FasterMake/RecursiveMake backend, we want
 	@# to ensure the FasterMake end doesn't have install manifests for the
 	@# same directory, because that would blow up
 	$(if $(wildcard _build_manifests/install/$(subst /,_,$*)),$(if $(wildcard faster/install_$(subst /,_,$*)*),$(error FasterMake and RecursiveMake ends of the hybrid build system want to handle $*)))
 endif
--- a/python/mozbuild/mozbuild/artifacts.py
+++ b/python/mozbuild/mozbuild/artifacts.py
@@ -58,17 +58,16 @@ import subprocess
 import tarfile
 import tempfile
 import urlparse
 import zipfile
 
 import pylru
 import taskcluster
 
-from mozbuild.action.test_archive import OBJDIR_TEST_FILES
 from mozbuild.util import (
     ensureParentDir,
     FileAvoidWrite,
 )
 import mozinstall
 from mozpack.files import (
     JarFinder,
     TarFinder,
@@ -192,27 +191,16 @@ class ArtifactJob(object):
                     destpath = mozpath.relpath(filename, src_prefix)
                     destpath = mozpath.join(dest_prefix, destpath)
                     self.log(logging.INFO, 'artifact',
                              {'destpath': destpath},
                              'Adding {destpath} to processed archive')
                     mode = entry['external_attr'] >> 16
                     writer.add(destpath.encode('utf-8'), reader[filename], mode=mode)
                     added_entry = True
-                for files_entry in OBJDIR_TEST_FILES.values():
-                    origin_pattern = files_entry['pattern']
-                    leaf_filename = filename
-                    if 'dest' in files_entry:
-                        dest = files_entry['dest']
-                        origin_pattern = mozpath.join(dest, origin_pattern)
-                        leaf_filename = filename[len(dest) + 1:]
-                    if mozpath.match(filename, origin_pattern):
-                        destpath = mozpath.join('..', files_entry['base'], leaf_filename)
-                        mode = entry['external_attr'] >> 16
-                        writer.add(destpath.encode('utf-8'), reader[filename], mode=mode)
 
         if not added_entry:
             raise ValueError('Archive format changed! No pattern from "{patterns}"'
                              'matched an archive path.'.format(
                                  patterns=LinuxArtifactJob.test_artifact_patterns))
 
     def process_symbols_archive(self, filename, processed_filename):
         with JarWriter(file=processed_filename, optimize=False, compress_level=5) as writer: