Backed out changeset d39ba5b549c5 (bug 1165061) for LSAN leaks. a=me
authorRyan VanderMeulen <ryanvm@gmail.com>
Thu, 21 May 2015 11:50:34 -0400
changeset 244933 cb33535b93f2cc8905104449e1a5e242ca86420f
parent 244932 e5d4a9bc3e23cd42667822f39ad3f6b41e892405
child 244997 0b1516ccf906013239e6c233d230c4e8bb5472bd
push id28793
push userryanvm@gmail.com
push dateThu, 21 May 2015 15:50:37 +0000
treeherdermozilla-central@cb33535b93f2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1165061
milestone41.0a1
backs outd39ba5b549c53efa063b966361969a8343d501d7
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 d39ba5b549c5 (bug 1165061) for LSAN leaks. a=me
toolkit/mozapps/update/tests/chrome/chrome.ini
toolkit/mozapps/update/tests/chrome/utils.js
toolkit/mozapps/update/tests/data/shared.js
toolkit/mozapps/update/updater/archivereader.cpp
toolkit/mozapps/update/updater/updater-xpcshell/moz.build
toolkit/mozapps/update/updater/updater.cpp
toolkit/mozapps/update/updater/updater.rc
--- a/toolkit/mozapps/update/tests/chrome/chrome.ini
+++ b/toolkit/mozapps/update/tests/chrome/chrome.ini
@@ -13,16 +13,18 @@ support-files =
 ; order and not in the order specified in the manifest.
 [test_0011_check_basic.xul]
 [test_0012_check_basic_license.xul]
 [test_0013_check_incompat_basic.xul]
 [test_0014_check_incompat_basic_license.xul]
 [test_0015_check_incompat_basic_addons.xul]
 [test_0016_check_incompat_basic_license_addons.xul]
 [test_0017_check_staging_basic.xul]
+skip-if = os != 'win'
+reason = Bug 918029 and bug 1164560 - timeout caused by copying too many files.
 [test_0021_check_billboard.xul]
 [test_0022_check_billboard_license.xul]
 [test_0023_check_incompat_billboard.xul]
 [test_0024_check_incompat_billboard_license.xul]
 [test_0025_check_incompat_billboard_addons.xul]
 [test_0026_check_incompat_billboard_license_addons.xul]
 [test_0031_available_basic.xul]
 [test_0032_available_basic_license.xul]
@@ -54,20 +56,20 @@ support-files =
 [test_0084_error_patchApplyFailure_verify_failed.xul]
 [test_0091_installed.xul]
 [test_0092_finishedBackground.xul]
 [test_0093_restartNotification.xul]
 [test_0094_restartNotification_remote.xul]
 [test_0095_restartNotification_remoteInvalidNumber.xul]
 [test_0096_restartNotification_stagedBackground.xul]
 [test_0097_restartNotification_stagedServiceBackground.xul]
-skip-if = os != 'win'
-reason = only Windows has the maintenance service.
 [test_0101_background_restartNotification.xul]
 [test_0102_background_restartNotification_staging.xul]
+skip-if = os == 'linux'
+reason = Bug 918029 - timeout caused by copying too many files.
 [test_0103_background_restartNotification_stagingService.xul]
 skip-if = os != 'win'
 reason = only Windows has the maintenance service.
 [test_0104_background_restartNotification_NoIncompatAddons.xul]
 [test_0105_background_restartNotification_VersionCompatAddons.xul]
 [test_0111_neverButton_basic.xul]
 [test_0112_neverButton_billboard.xul]
 [test_0113_showNeverForVersionRemovedWithPref.xul]
--- a/toolkit/mozapps/update/tests/chrome/utils.js
+++ b/toolkit/mozapps/update/tests/chrome/utils.js
@@ -325,17 +325,16 @@ function runTestDefaultWaitForWindowClos
     SimpleTest.executeSoon(runTestDefaultWaitForWindowClosed);
   } else {
     Services.ww.registerNotification(gWindowObserver);
 
     gCloseWindowTimeoutCounter = 0;
 
     setupFiles();
     setupPrefs();
-    gEnv.set("MOZ_TEST_SKIP_UPDATE_STAGE", "1");
     removeUpdateDirsAndFiles();
     reloadUpdateManagerData();
     setupAddons(runTest);
   }
 }
 
 /**
  * Default test finish function that can be used by most tests. This function
@@ -354,17 +353,16 @@ function finishTestDefault() {
     debugDump("channel = " + gChannel);
     gChannel = null;
     gPrefRoot.removeObserver(PREF_APP_UPDATE_CHANNEL, observer);
   }
 
   verifyTestsRan();
 
   resetPrefs();
-  gEnv.set("MOZ_TEST_SKIP_UPDATE_STAGE", "");
   resetFiles();
   removeUpdateDirsAndFiles();
   reloadUpdateManagerData();
 
   Services.ww.unregisterNotification(gWindowObserver);
   if (gDocElem) {
     gDocElem.removeEventListener("pageshow", onPageShowDefault, false);
   }
--- a/toolkit/mozapps/update/tests/data/shared.js
+++ b/toolkit/mozapps/update/tests/data/shared.js
@@ -125,20 +125,16 @@ XPCOMUtils.defineLazyGetter(this, "gUP",
 XPCOMUtils.defineLazyGetter(this, "gDefaultPrefBranch", function test_gDPB() {
   return Services.prefs.getDefaultBranch(null);
 });
 
 XPCOMUtils.defineLazyGetter(this, "gPrefRoot", function test_gPR() {
   return Services.prefs.getBranch(null);
 });
 
-XPCOMUtils.defineLazyServiceGetter(this, "gEnv",
-                                   "@mozilla.org/process/environment;1",
-                                   "nsIEnvironment");
-
 XPCOMUtils.defineLazyGetter(this, "gZipW", function test_gZipW() {
   return Cc["@mozilla.org/zipwriter;1"].
          createInstance(Ci.nsIZipWriter);
 });
 
 /* Initializes the update service stub */
 function initUpdateServiceStub() {
   Cc["@mozilla.org/updates/update-service-stub;1"].
--- a/toolkit/mozapps/update/updater/archivereader.cpp
+++ b/toolkit/mozapps/update/updater/archivereader.cpp
@@ -13,17 +13,17 @@
 #ifdef XP_WIN
 #include "nsAlgorithm.h" // Needed by nsVersionComparator.cpp
 #include "updatehelper.h"
 #endif
 
 // These are generated at compile time based on the DER file for the channel
 // being used
 #ifdef MOZ_VERIFY_MAR_SIGNATURE
-#ifdef TEST_UPDATER
+#ifdef UPDATER_XPCSHELL_CERT
 #include "../xpcshellCert.h"
 #else
 #include "primaryCert.h"
 #include "secondaryCert.h"
 #endif
 #endif
 
 #define UPDATER_NO_STRING_GLUE_STL
@@ -80,17 +80,17 @@ ArchiveReader::VerifySignature()
 {
   if (!mArchive) {
     return ARCHIVE_NOT_OPEN;
   }
 
 #ifndef MOZ_VERIFY_MAR_SIGNATURE
   return OK;
 #else
-#ifdef TEST_UPDATER
+#ifdef UPDATER_XPCSHELL_CERT
   int rv = VerifyLoadedCert(mArchive, xpcshellCertData);
 #else
   int rv = VerifyLoadedCert(mArchive, primaryCertData);
   if (rv != OK) {
     rv = VerifyLoadedCert(mArchive, secondaryCertData);
   }
 #endif
   return rv;
--- a/toolkit/mozapps/update/updater/updater-xpcshell/moz.build
+++ b/toolkit/mozapps/update/updater/updater-xpcshell/moz.build
@@ -3,11 +3,11 @@
 # 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/.
 
 Program('updater-xpcshell')
 
 updater_rel_path = '../'
 DIST_INSTALL = False
-DEFINES['TEST_UPDATER'] = True
+DEFINES['UPDATER_XPCSHELL_CERT'] = True
 include('../updater-common.build')
 FAIL_ON_WARNINGS = True
--- a/toolkit/mozapps/update/updater/updater.cpp
+++ b/toolkit/mozapps/update/updater/updater.cpp
@@ -2255,28 +2255,17 @@ UpdateThreadFunc(void *param)
 
         rv = gArchiveReader.VerifyProductInformation(MARStrings.MARChannelID,
                                                      MOZ_APP_VERSION);
       }
     }
 #endif
 
     if (rv == OK && sStagedUpdate && !sIsOSUpdate) {
-#ifdef TEST_UPDATER
-      // The MOZ_TEST_SKIP_UPDATE_STAGE environment variable prevents copying
-      // the files in dist/bin in the test updater when staging an update since
-      // this can cause tests to timeout.
-      if (getenv("MOZ_TEST_SKIP_UPDATE_STAGE")) {
-        rv = OK;
-      } else {
-        rv = CopyInstallDirToDestDir();
-      }
-#else
       rv = CopyInstallDirToDestDir();
-#endif
     }
 
     if (rv == OK) {
       rv = DoUpdate();
       gArchiveReader.Close();
       NS_tchar updatingDir[MAXPATHLEN];
       NS_tsnprintf(updatingDir, sizeof(updatingDir)/sizeof(updatingDir[0]),
                    NS_T("%s/updating"), gWorkingDirPath);
--- 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.
 //
-#ifdef TEST_UPDATER
+#ifdef UPDATER_XPCSHELL_CERT
 #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"