Bug 901136 - Fix the default search path for mozinfo.json [r=jmaher]
authorMatt Brubeck <mbrubeck@mozilla.com>
Sat, 03 Aug 2013 08:54:52 -0700
changeset 153524 2910105ec7495b5f741597d097d60ae1ea366a42
parent 153523 ffe8cd748b6b98ce21c03233340bd40077416080
child 153525 4ee48f7a741d60e8e830d135cb6e78712db93b9d
push id2859
push userakeybl@mozilla.com
push dateMon, 16 Sep 2013 19:14:59 +0000
treeherdermozilla-beta@87d3c51cd2bf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher
bugs901136
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 901136 - Fix the default search path for mozinfo.json [r=jmaher]
testing/mochitest/mochitest_options.py
--- a/testing/mochitest/mochitest_options.py
+++ b/testing/mochitest/mochitest_options.py
@@ -463,17 +463,17 @@ class MochitestOptions(optparse.OptionPa
         if options.runUntilFailure:
             if not os.path.isfile(os.path.join(mochitest.oldcwd, os.path.dirname(__file__), mochitest.getTestRoot(options), options.testPath)):
                 self.error("--run-until-failure can only be used together with --test-path specifying a single test.")
             if not options.repeat:
                 options.repeat = 29
 
         if not options.mozInfo:
             if build_obj:
-                options.mozInfo = os.path.join(build_obj.get_binary_path(), 'mozinfo.json')
+                options.mozInfo = os.path.join(build_obj.topobjdir, 'mozinfo.json')
             else:
                 options.mozInfo = os.path.abspath('mozinfo.json')
 
         if not os.path.isfile(options.mozInfo):
             self.error("Unable to file build information file (mozinfo.json) at this location: %s" % options.mozInfo)
 
         return options