Backed out changeset 31ff9550fba6 (bug 870073) for checktest failures.
authorRyan VanderMeulen <ryanvm@gmail.com>
Thu, 09 May 2013 17:14:47 -0400
changeset 142396 59347767166eff194c52b76e8231c6c4e343d8c9
parent 142395 0871f59b1ad5cca23562a3316c6eb53b910301df
child 142397 8011f4e535fa3f6b929fcd0b1ab003d022327381
push id2579
push userakeybl@mozilla.com
push dateMon, 24 Jun 2013 18:52:47 +0000
treeherdermozilla-beta@b69b7de8a05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs870073
milestone23.0a1
backs out31ff9550fba69b0e222cc8d6112b1676ab0c7bb0
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 31ff9550fba6 (bug 870073) for checktest failures. CLOSED TREE
config/writemozinfo.py
--- a/config/writemozinfo.py
+++ b/config/writemozinfo.py
@@ -24,20 +24,21 @@ def build_dict(env=os.environ):
     d = {}
     # Check that all required variables are present first.
     required = ["TARGET_CPU", "OS_TARGET", "MOZ_WIDGET_TOOLKIT"]
     missing = [r for r in required if r not in env]
     if missing:
         raise Exception("Missing required environment variables: %s" %
                         ', '.join(missing))
 
-    d["topsrcdir"] = env["TOPSRCDIR"]
+    if 'MOZCONFIG' in env:
+        d["mozconfig"] = env["MOZCONFIG"]
 
-    if 'MOZCONFIG' in env:
-        d["mozconfig"] = os.path.join(d['topsrcdir'], env["MOZCONFIG"])
+    if 'TOPSRCDIR' in env:
+        d["topsrcdir"] = env["TOPSRCDIR"]
 
     # os
     o = env["OS_TARGET"]
     known_os = {"Linux": "linux",
                 "WINNT": "win",
                 "Darwin": "mac",
                 "Android": "b2g" if env["MOZ_WIDGET_TOOLKIT"] == "gonk" else "android"}
     if o in known_os: