Mac v2 signing - backing out Bug 1060652 to reland updated patch
authorRobert Strong <robert.bugzilla@gmail.com>
Sat, 27 Sep 2014 21:02:54 -0700
changeset 491287 dda3674cff4de1084b237291a19243162179c955
parent 491286 d016a561afc4d5ddeef49e7a3a7dc8fdc019bd0e
child 491288 c4aa337ca6344ef3b4bab3842f7c83066b01443d
push id47343
push userbmo:dothayer@mozilla.com
push dateWed, 01 Mar 2017 22:58:58 +0000
bugs1060652
milestone35.0a1
Mac v2 signing - backing out Bug 1060652 to reland updated patch
browser/app/macbuild/Contents/MacOS-files.in
testing/mochitest/mochitest_options.py
testing/mochitest/runtests.py
--- a/browser/app/macbuild/Contents/MacOS-files.in
+++ b/browser/app/macbuild/Contents/MacOS-files.in
@@ -1,8 +1,5 @@
 /*.app/***
 /*.dylib
-/certutil
 /firefox-bin
-/pk12util
-/ssltunnel
 /webapprt-stub
 /XUL
--- a/testing/mochitest/mochitest_options.py
+++ b/testing/mochitest/mochitest_options.py
@@ -470,18 +470,16 @@ class MochitestOptions(optparse.OptionPa
             if not 1 <= options.thisChunk <= options.totalChunks:
                 self.error("thisChunk must be between 1 and totalChunks")
 
         if options.xrePath is None:
             # default xrePath to the app path if not provided
             # but only if an app path was explicitly provided
             if options.app != self.defaults['app']:
                 options.xrePath = os.path.dirname(options.app)
-                if mozinfo.isMac:
-                    options.xrePath = os.path.join(os.path.dirname(options.xrePath), "Resources")
             elif build_obj is not None:
                 # otherwise default to dist/bin
                 options.xrePath = build_obj.bindir
             else:
                 self.error("could not find xre directory, --xre-path must be specified")
 
         # allow relative paths
         options.xrePath = mochitest.getFullPath(options.xrePath)
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -302,17 +302,16 @@ class MochitestServer(object):
     self._httpdPath = os.path.abspath(self._httpdPath)
 
   def start(self):
     "Run the Mochitest server, returning the process ID of the server."
 
     # get testing environment
     env = environment(xrePath=self._xrePath)
     env["XPCOM_DEBUG_BREAK"] = "warn"
-    env["DYLD_LIBRARY_PATH"] = os.path.join(os.path.dirname(self._xrePath), 'MacOS')
     env["LD_LIBRARY_PATH"] = self._xrePath
 
     # When running with an ASan build, our xpcshell server will also be ASan-enabled,
     # thus consuming too much resources when running together with the browser on
     # the test slaves. Try to limit the amount of resources by disabling certain
     # features.
     env["ASAN_OPTIONS"] = "quarantine_size=1:redzone=32:malloc_context_size=5"
 
@@ -699,18 +698,16 @@ class MochitestUtilsMixin(object):
     self.sslPort = options.sslPort
     self.webSocketPort = options.webSocketPort
 
     # httpd-path is specified by standard makefile targets and may be specified
     # on the command line to select a particular version of httpd.js. If not
     # specified, try to select the one from hostutils.zip, as required in bug 882932.
     if not options.httpdPath:
       options.httpdPath = os.path.join(options.utilityPath, "components")
-      if not os.path.exists(options.httpdPath) and (sys.platform == 'osx' or sys.platform == "darwin"):
-        options.httpdPath = os.path.join(os.path.dirname(options.utilityPath), "Resources", "components")
 
     self.startWebServer(options)
     self.startWebSocketServer(options, debuggerInfo)
 
     # start SSL pipe
     self.sslTunnel = SSLTunnel(options, logger=self.log)
     self.sslTunnel.buildConfig(self.locations)
     self.sslTunnel.start()
@@ -909,17 +906,16 @@ class SSLTunnel:
     # start ssltunnel to provide https:// URLs capability
     bin_suffix = mozinfo.info.get('bin_suffix', '')
     ssltunnel = os.path.join(self.utilityPath, "ssltunnel" + bin_suffix)
     if not os.path.exists(ssltunnel):
       self.log.error("INFO | runtests.py | expected to find ssltunnel at %s" % ssltunnel)
       exit(1)
 
     env = environment(xrePath=self.xrePath)
-    env["DYLD_LIBRARY_PATH"] = os.path.join(os.path.dirname(self.xrePath), 'MacOS')
     env["LD_LIBRARY_PATH"] = self.xrePath
     self.process = mozprocess.ProcessHandler([ssltunnel, self.configFile],
                                                env=env)
     self.process.run()
     self.log.info("runtests.py | SSL tunnel pid: %d" % self.process.pid)
 
   def stop(self):
     """ Stops the SSL Tunnel and cleans up """
@@ -1088,17 +1084,16 @@ class Mochitest(MochitestUtilsMixin):
     # https://bugzilla.mozilla.org/show_bug.cgi?id=746243#c35
 
     pwfilePath = os.path.join(options.profilePath, ".crtdbpw")
     with open(pwfilePath, "w") as pwfile:
       pwfile.write("\n")
 
     # Pre-create the certification database for the profile
     env = self.environment(xrePath=options.xrePath)
-    env["DYLD_LIBRARY_PATH"] = os.path.join(os.path.dirname(options.xrePath), 'MacOS')
     env["LD_LIBRARY_PATH"] = options.xrePath
     bin_suffix = mozinfo.info.get('bin_suffix', '')
     certutil = os.path.join(options.utilityPath, "certutil" + bin_suffix)
     pk12util = os.path.join(options.utilityPath, "pk12util" + bin_suffix)
 
     if self.certdbNew:
       # android and b2g use the new DB formats exclusively
       certdbPath = "sql:" + options.profilePath