Bug 898903 - Prevent env["PATH"] from becoming Unicode on Windows. r=jgriffin
authorMasatoshi Kimura <VYV03354@nifty.ne.jp>
Tue, 30 Jul 2013 10:02:28 -0400
changeset 140509 b0a220412a58bf983a591c090c4e0d9815f435f9
parent 140388 8911e64ad234b3519e2aa52b4144db67631b0ea9
child 140510 e9530cf2baedb03ac5755aae51860ee8feafaba9
push id25031
push userryanvm@gmail.com
push dateTue, 30 Jul 2013 19:41:18 +0000
treeherdermozilla-central@72240998c094 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgriffin
bugs898903
milestone25.0a1
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
Bug 898903 - Prevent env["PATH"] from becoming Unicode on Windows. r=jgriffin
build/automation.py.in
testing/mochitest/runtests.py
--- a/build/automation.py.in
+++ b/build/automation.py.in
@@ -729,17 +729,17 @@ user_pref("camino.use_system_proxy_setti
       if self.IS_MAC:
         envVar = "DYLD_LIBRARY_PATH"
       else: # unixish
         env['MOZILLA_FIVE_HOME'] = xrePath
       if envVar in env:
         ldLibraryPath = ldLibraryPath + ":" + env[envVar]
       env[envVar] = ldLibraryPath
     elif self.IS_WIN32:
-      env["PATH"] = env["PATH"] + ";" + ldLibraryPath
+      env["PATH"] = env["PATH"] + ";" + str(ldLibraryPath)
 
     if crashreporter:
       env['MOZ_CRASHREPORTER_NO_REPORT'] = '1'
       env['MOZ_CRASHREPORTER'] = '1'
     else:
       env['MOZ_CRASHREPORTER_DISABLE'] = '1'
 
     env['GNOME_DISABLE_CRASH_DIALOG'] = '1'
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -65,17 +65,17 @@ class MochitestServer:
 
     # 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"
 
     if mozinfo.isWin:
-      env["PATH"] = env["PATH"] + ";" + self._xrePath
+      env["PATH"] = env["PATH"] + ";" + str(self._xrePath)
 
     args = ["-g", self._xrePath,
             "-v", "170",
             "-f", self._httpdPath + "/httpd.js",
             "-e", """const _PROFILE_PATH = '%(profile)s';const _SERVER_PORT = '%(port)s'; const _SERVER_ADDR = '%(server)s';
                      const _TEST_PREFIX = %(testPrefix)s; const _DISPLAY_RESULTS = %(displayResults)s;""" %
                    {"profile" : self._profileDir.replace('\\', '\\\\'), "port" : self.httpPort, "server" : self.webServer,
                     "testPrefix" : self.testPrefix, "displayResults" : str(not self._closeWhenDone).lower() },