Backed out changeset 96059b4f6d8a (bug 1490119) for breaking OSX builds r=bhearsum a=backout
authorBogdan Tara <btara@mozilla.com>
Thu, 20 Sep 2018 02:52:19 +0300
changeset 437333 ac9f1219d11bf1a56ec1ace8e3ba9ff113b5cacb
parent 437332 d2e41f2f964d699255cd37df187f058a1b5a8423
child 437356 99fca7c96504911d640998a1d7604a6849f0c8d8
child 437374 9c2e739e11ca6b0bed6c5ba359c46e19a67ff384
push id34677
push userbtara@mozilla.com
push dateWed, 19 Sep 2018 23:52:34 +0000
treeherdermozilla-central@ac9f1219d11b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbhearsum, backout
bugs1490119
milestone64.0a1
backs out96059b4f6d8a1590c97ffc47ca7f73530dd51cb5
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 96059b4f6d8a (bug 1490119) for breaking OSX builds r=bhearsum a=backout
build/gen_test_packages_manifest.py
python/mozbuild/mozbuild/action/test_archive.py
testing/testsuite-targets.mk
toolkit/mozapps/update/updater/archivereader.cpp
toolkit/mozapps/update/updater/moz.build
toolkit/mozapps/update/updater/updater-dep/Makefile.in
toolkit/mozapps/update/updater/updater-dep/moz.build
toolkit/mozapps/update/updater/updater.rc
--- a/build/gen_test_packages_manifest.py
+++ b/build/gen_test_packages_manifest.py
@@ -16,29 +16,27 @@ ALL_HARNESSES = [
     'cppunittest',
     'jittest',
     'mozbase',
     'web-platform',
     'talos',
     'raptor',
     'awsy',
     'gtest',
-    'updater-dep'
 ]
 
 PACKAGE_SPECIFIED_HARNESSES = [
     'cppunittest',
     'mochitest',
     'reftest',
     'xpcshell',
     'web-platform',
     'talos',
     'raptor',
     'awsy',
-    'updater-dep',
 ]
 
 # These packages are not present for every build configuration.
 OPTIONAL_PACKAGES = [
     'gtest',
 ]
 
 
--- a/python/mozbuild/mozbuild/action/test_archive.py
+++ b/python/mozbuild/mozbuild/action/test_archive.py
@@ -105,17 +105,16 @@ ARCHIVE_FILES = {
                 'gtest/**',
                 'mochitest/**',
                 'reftest/**',
                 'talos/**',
                 'raptor/**',
                 'awsy/**',
                 'web-platform/**',
                 'xpcshell/**',
-                'updater-dep/**',
             ],
         },
         {
             'source': buildconfig.topobjdir,
             'base': '_tests',
             'pattern': 'modules/**',
         },
         {
@@ -515,31 +514,16 @@ ARCHIVE_FILES = {
         },
         {
             'source': buildconfig.topobjdir,
             'base': 'build',
             'pattern': 'automation.py',
             'dest': 'xpcshell',
         },
     ],
-    'updater-dep': [
-        {
-            'source': buildconfig.topobjdir,
-            'base': '_tests/updater-dep',
-            'pattern': '**',
-            'dest': 'updater-dep',
-        },
-        # Required by the updater on Linux
-        {
-            'source': buildconfig.topobjdir,
-            'base': 'config/external/sqlite',
-            'pattern': 'libmozsqlite3.so',
-            'dest': 'updater-dep',
-        },
-    ],
 }
 
 if buildconfig.substs.get('MOZ_CODE_COVERAGE'):
     ARCHIVE_FILES['common'].append({
         'source': buildconfig.topsrcdir,
         'base': 'python/mozbuild/',
         'patterns': [
             'mozpack/**',
@@ -637,17 +621,17 @@ def find_files(archive):
 
         ignore = list(entry.get('ignore', []))
         ignore.extend([
             '**/.flake8',
             '**/.mkdir.done',
             '**/*.pyc',
         ])
 
-        if archive not in ('common', 'updater-dep') and base.startswith('_tests'):
+        if archive != 'common' and base.startswith('_tests'):
             # We may have generated_harness_files to exclude from this entry.
             for path in generated_harness_files:
                 if path.startswith(base):
                     ignore.append(path[len(base) + 1:])
 
         common_kwargs = {
             'find_dotfiles': True,
             'ignore': ignore,
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -120,17 +120,16 @@ TEST_PKGS_TARGZ := \
   cppunittest \
   mochitest \
   reftest \
   talos \
   raptor \
   awsy \
   xpcshell \
   web-platform \
-  updater-dep \
   $(NULL)
 
 ifdef LINK_GTEST_DURING_COMPILE
 stage-all: stage-gtest
 TEST_PKGS_ZIP += gtest
 endif
 
 PKG_ARG = --$(1) '$(PKG_BASENAME).$(1).tests.$(2)'
--- a/toolkit/mozapps/update/updater/archivereader.cpp
+++ b/toolkit/mozapps/update/updater/archivereader.cpp
@@ -20,19 +20,16 @@
 #define XZ_USE_CRC64
 #include "xz.h"
 
 // These are generated at compile time based on the DER file for the channel
 // being used
 #ifdef MOZ_VERIFY_MAR_SIGNATURE
 #ifdef TEST_UPDATER
 #include "../xpcshellCert.h"
-#elif DEP_UPDATER
-#include "../dep1Cert.h"
-#include "../dep2Cert.h"
 #else
 #include "primaryCert.h"
 #include "secondaryCert.h"
 #endif
 #endif
 
 #define UPDATER_NO_STRING_GLUE_STL
 #include "nsVersionComparator.cpp"
@@ -85,21 +82,16 @@ ArchiveReader::VerifySignature()
     return ARCHIVE_NOT_OPEN;
   }
 
 #ifndef MOZ_VERIFY_MAR_SIGNATURE
   return OK;
 #else
 #ifdef TEST_UPDATER
   int rv = VerifyLoadedCert(mArchive, xpcshellCertData);
-#elif DEP_UPDATER
-  int rv = VerifyLoadedCert(mArchive, dep1CertData);
-  if (rv != OK) {
-    rv = VerifyLoadedCert(mArchive, dep2CertData);
-  }
 #else
   int rv = VerifyLoadedCert(mArchive, primaryCertData);
   if (rv != OK) {
     rv = VerifyLoadedCert(mArchive, secondaryCertData);
   }
 #endif
   return rv;
 #endif
--- a/toolkit/mozapps/update/updater/moz.build
+++ b/toolkit/mozapps/update/updater/moz.build
@@ -6,64 +6,55 @@
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     Program('org.mozilla.updater')
 else:
     Program('updater')
 
 updater_rel_path = ''
 include('updater-common.build')
-DIRS += ['updater-dep']
 if CONFIG['ENABLE_TESTS']:
     DIRS += ['updater-xpcshell']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     LDFLAGS += ['-sectcreate',
                 '__TEXT',
                 '__info_plist',
                 TOPOBJDIR + '/dist/bin/Info.plist',
                 '-sectcreate',
                 '__TEXT',
                 '__launchd_plist',
                 SRCDIR + '/Launchd.plist']
 
 GENERATED_FILES = [
-    'dep1Cert.h',
-    'dep2Cert.h',
     'primaryCert.h',
     'secondaryCert.h',
     'xpcshellCert.h',
 ]
 
 primary_cert = GENERATED_FILES['primaryCert.h']
 secondary_cert = GENERATED_FILES['secondaryCert.h']
 
 # This is how the xpcshellCertificate.der file is generated, in case we ever
 # have to regenerate it.
 # ./certutil -L -d modules/libmar/tests/unit/data -n mycert -r > xpcshellCertificate.der
 xpcshell_cert = GENERATED_FILES['xpcshellCert.h']
-dep1_cert = GENERATED_FILES['dep1Cert.h']
-dep2_cert = GENERATED_FILES['dep2Cert.h']
 
 primary_cert.script = 'gen_cert_header.py:create_header'
 secondary_cert.script = 'gen_cert_header.py:create_header'
 xpcshell_cert.script = 'gen_cert_header.py:create_header'
-dep1_cert.script = 'gen_cert_header.py:create_header'
-dep2_cert.script = 'gen_cert_header.py:create_header'
 
 if CONFIG['MOZ_UPDATE_CHANNEL'] in ('beta', 'release', 'esr'):
     primary_cert.inputs += ['release_primary.der']
     secondary_cert.inputs += ['release_secondary.der']
 elif CONFIG['MOZ_UPDATE_CHANNEL'] in ('nightly', 'aurora', 'nightly-elm',
                                       'nightly-profiling', 'nightly-oak',
                                       'nightly-ux'):
     primary_cert.inputs += ['nightly_aurora_level3_primary.der']
     secondary_cert.inputs += ['nightly_aurora_level3_secondary.der']
 else:
     primary_cert.inputs += ['dep1.der']
     secondary_cert.inputs += ['dep2.der']
 
-dep1_cert.inputs += ['dep1.der']
-dep2_cert.inputs += ['dep2.der']
 xpcshell_cert.inputs += ['xpcshellCertificate.der']
 
 if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
     FINAL_TARGET_FILES.icons += ['updater.png']
deleted file mode 100644
--- a/toolkit/mozapps/update/updater/updater-dep/Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
-# vim:set ts=8 sw=8 sts=8 noet:
-# 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/.
-
-# For changes here, also consider ../Makefile.in
-
-include $(topsrcdir)/config/rules.mk
-
-tools::
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-	# Copy for xpcshell tests
-	$(NSINSTALL) -D $(FINAL_TARGET)/updater-dep.app
-	rsync -a -C --exclude '*.in' $(srcdir)/../macbuild/Contents $(FINAL_TARGET)/updater-dep.app
-	sed -e 's/%APP_NAME%/$(MOZ_APP_DISPLAYNAME)/' $(srcdir)/../macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | \
-	  iconv -f UTF-8 -t UTF-16 > $(FINAL_TARGET)/updater-dep.app/Contents/Resources/English.lproj/InfoPlist.strings
-	$(NSINSTALL) -D $(FINAL_TARGET)/updater-dep.app/Contents/MacOS
-	$(NSINSTALL) $(FINAL_TARGET)/updater-dep $(FINAL_TARGET)/updater-dep.app/Contents/MacOS
-	mv $(FINAL_TARGET)/updater-dep.app/Contents/MacOS/updater-dep $(FINAL_TARGET)/updater-dep.app/Contents/MacOS/org.mozilla.updater
-endif
deleted file mode 100644
--- a/toolkit/mozapps/update/updater/updater-dep/moz.build
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# 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/.
-
-FINAL_TARGET = '_tests/updater-dep'
-
-Program('updater-dep')
-
-updater_rel_path = '../'
-DEFINES['DEP_UPDATER'] = True
-include('../updater-common.build')
-
--- a/toolkit/mozapps/update/updater/updater.rc
+++ b/toolkit/mozapps/update/updater/updater.rc
@@ -1,15 +1,15 @@
 /* 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/. */
 
 // Microsoft Visual C++ generated resource script.
 //
-#if defined(TEST_UPDATER) || defined(DEP_UPDATER)
+#ifdef TEST_UPDATER
 #include "../resource.h"
 #define MANIFEST_PATH "../updater.exe.manifest"
 #define COMCTL32_MANIFEST_PATH "../updater.exe.comctl32.manifest"
 #define ICON_PATH "../updater.ico"
 #else
 #include "resource.h"
 #define MANIFEST_PATH "updater.exe.manifest"
 #define COMCTL32_MANIFEST_PATH "updater.exe.comctl32.manifest"