Bug 1170632 - Fix platform_guess for osx; add pgo runtimes for mbc, r=ahal
authorJonathan Griffin <jgriffin@mozilla.com>
Fri, 05 Jun 2015 16:29:18 -0700
changeset 247692 eb611a75140e1e26d9930d92f27c413697c6032e
parent 247691 03ff333d49c037b4b15dbf501f177491b8e2fc0b
child 247693 addd8d2a91e6c5497c712b19b1aead7cab146439
push idunknown
push userunknown
push dateunknown
reviewersahal
bugs1170632
milestone41.0a1
Bug 1170632 - Fix platform_guess for osx; add pgo runtimes for mbc, r=ahal
python/mozbuild/mozbuild/mozinfo.py
testing/runtimes/linux-pgo/mochitest-browser-chrome.runtimes.json
testing/runtimes/linux-pgo/mochitest-e10s-browser-chrome.runtimes.json
--- a/python/mozbuild/mozbuild/mozinfo.py
+++ b/python/mozbuild/mozbuild/mozinfo.py
@@ -126,17 +126,17 @@ def build_dict(config, env=os.environ):
         if d['pgo']:
             return 'pgo'
         if d['asan']:
             return 'asan'
         return 'opt'
 
     # if buildapp or bits are unknown, we don't have a configuration similar to
     # any in automation and the guesses are useless.
-    if 'buildapp' in d and 'bits' in d:
+    if 'buildapp' in d and (d['os'] == 'mac' or 'bits' in d):
         d['platform_guess'] = guess_platform()
         d['buildtype_guess'] = guess_buildtype()
 
     return d
 
 
 def write_mozinfo(file, config, env=os.environ):
     """Write JSON data about the configuration specified in config and an
new file mode 100644
--- /dev/null
+++ b/testing/runtimes/linux-pgo/mochitest-browser-chrome.runtimes.json
@@ -0,0 +1,1 @@
+{"excluded_test_average": 1685, "runtimes": {"browser/base/content/test/newtab/browser_newtab_drag_drop.js": 11245, "browser/components/sessionstore/test/browser_394759_behavior.js": 11451, "testing/mochitest/tests/browser/browser_async.js": 10026, "testing/mochitest/tests/browser/browser_fail_timeout.js": 40027, "toolkit/mozapps/extensions/test/browser/test-window/browser_types.js": 15129, "browser/components/customizableui/test/browser_890140_orphaned_placeholders.js": 10150, "toolkit/mozapps/extensions/test/browser/browser_cancelCompatCheck.js": 15705, "toolkit/mozapps/extensions/test/browser/browser_discovery.js": 22303, "browser/components/privatebrowsing/test/browser/browser_privatebrowsing_windowtitle.js": 13376, "toolkit/mozapps/extensions/test/browser/browser_searching.js": 10926, "browser/base/content/test/social/browser_social_window.js": 14749, "toolkit/mozapps/extensions/test/browser/test-window/browser_searching.js": 11002, "browser/components/sessionstore/test/browser_615394-SSWindowState_events.js": 12138, "browser/base/content/test/general/browser_sanitizeDialog.js": 11850, "toolkit/components/social/test/browser/browser_frameworker.js": 10744, "testing/mochitest/tests/browser/browser_fail_unexpectedTimeout.js": 40026, "toolkit/mozapps/extensions/test/browser/browser_bug557956.js": 13939, "browser/components/sessionstore/test/browser_354894_perwindowpb.js": 15388, "toolkit/mozapps/extensions/test/browser/browser_details.js": 12285, "toolkit/mozapps/extensions/test/browser/browser_updatessl.js": 18013, "toolkit/mozapps/extensions/test/browser/test-window/browser_uninstalling.js": 10431, "browser/base/content/test/general/browser_devices_get_user_media.js": 21887, "toolkit/mozapps/extensions/test/browser/browser_uninstalling.js": 10683, "dom/tests/browser/browser_test_new_window_from_content.js": 13735, "browser/components/uitour/test/browser_UITour_heartbeat.js": 16360, "toolkit/mozapps/extensions/test/browser/browser_bug562797.js": 28081, "toolkit/components/startup/tests/browser/browser_crash_detection.js": 35021, "toolkit/mozapps/extensions/test/browser/test-window/browser_bug562797.js": 17288, "browser/base/content/test/general/browser_parsable_script.js": 29069, "browser/components/sessionstore/test/browser_formdata_cc.js": 13832, "toolkit/mozapps/extensions/test/browser/browser_types.js": 11780, "browser/base/content/test/general/browser_bug906190.js": 14677, "toolkit/mozapps/extensions/test/browser/test-window/browser_details.js": 10323, "browser/base/content/test/general/browser_bug553455.js": 17553, "toolkit/components/social/test/browser/browser_frameworker_sandbox.js": 10686, "browser/components/tabview/test/browser_tabview_bug613541.js": 12213, "toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js": 14854, "toolkit/mozapps/extensions/test/browser/test-window/browser_discovery.js": 24668, "toolkit/mozapps/extensions/test/browser/browser_installssl.js": 12006}}
new file mode 100644
--- /dev/null
+++ b/testing/runtimes/linux-pgo/mochitest-e10s-browser-chrome.runtimes.json
@@ -0,0 +1,1 @@
+{"excluded_test_average": 1795, "runtimes": {"browser/components/sessionstore/test/browser_394759_behavior.js": 12626, "toolkit/mozapps/extensions/test/browser/browser_cancelCompatCheck.js": 18723, "browser/components/sessionstore/test/browser_522545.js": 11737, "browser/components/preferences/in-content/tests/browser_privacypane_4.js": 10249, "toolkit/mozapps/extensions/test/browser/browser_updatessl.js": 28267, "toolkit/components/thumbnails/test/browser_thumbnails_privacy.js": 10058, "testing/mochitest/tests/browser/browser_async.js": 10034, "toolkit/mozapps/extensions/test/browser/browser_installssl.js": 23027, "testing/mochitest/tests/browser/browser_fail_timeout.js": 40036, "toolkit/mozapps/extensions/test/browser/browser_searching.js": 14728, "browser/base/content/test/social/browser_social_window.js": 10371, "toolkit/mozapps/extensions/test/browser/test-window/browser_searching.js": 13564, "browser/components/sessionstore/test/browser_615394-SSWindowState_events.js": 15759, "browser/base/content/test/referrer/browser_referrer_open_link_in_private.js": 10181, "browser/base/content/test/general/browser_sanitizeDialog.js": 11012, "testing/mochitest/tests/browser/browser_fail_unexpectedTimeout.js": 40036, "browser/components/sessionstore/test/browser_crashedTabs.js": 14197, "browser/components/sessionstore/test/browser_354894_perwindowpb.js": 13016, "toolkit/mozapps/extensions/test/browser/browser_details.js": 16004, "toolkit/components/perfmonitoring/tests/browser/browser_AddonWatcher.js": 11790, "browser/base/content/test/general/browser_urlbarSearchSingleWordNotification.js": 10355, "toolkit/mozapps/extensions/test/browser/browser_install.js": 11248, "browser/components/sessionstore/test/browser_cookies.js": 10229, "browser/base/content/test/general/browser_bug553455.js": 18532, "toolkit/mozapps/extensions/test/browser/test-window/browser_install.js": 11922, "browser/components/customizableui/test/browser_890140_orphaned_placeholders.js": 10011, "toolkit/components/startup/tests/browser/browser_crash_detection.js": 35028, "dom/manifest/test/browser_ManifestObtainer_obtain.js": 15033, "browser/base/content/test/general/browser_parsable_script.js": 25085, "browser/components/sessionstore/test/browser_formdata_cc.js": 12887, "browser/base/content/test/referrer/browser_referrer_open_link_in_window.js": 10342, "toolkit/mozapps/extensions/test/browser/test-window/browser_details.js": 15117, "toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js": 21034}}