Bug 1179292 - Make mozinfo recognize linux64-asan as a distinct platform, r=ahal
authorJonathan Griffin <jgriffin@mozilla.com>
Thu, 16 Jul 2015 13:17:56 -0700
changeset 253390 6376e51185e8a31331eabe49408e477d57029e5c
parent 253389 7325fc8acaca3e3e363d4c4c51360caaa9af0eb3
child 253391 9b7107f5d99ef8bd1d2d1229bd0680e6f9c12b96
push id29065
push userryanvm@gmail.com
push dateFri, 17 Jul 2015 14:26:32 +0000
treeherdermozilla-central@911935404233 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersahal
bugs1179292
milestone42.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 1179292 - Make mozinfo recognize linux64-asan as a distinct platform, r=ahal
python/mozbuild/mozbuild/mozinfo.py
--- a/python/mozbuild/mozbuild/mozinfo.py
+++ b/python/mozbuild/mozbuild/mozinfo.py
@@ -103,16 +103,20 @@ def build_dict(config, env=os.environ):
                 p = 'macosx64'
             elif d['bits'] == 64:
                 p = '{}64'.format(p)
             elif p in ('win',):
                 p = '{}32'.format(p)
 
             if d['buildapp'] == 'mulet':
                 p = '{}-mulet'.format(p)
+
+            if d['asan']:
+                p = '{}-asan'.format(p)
+
             return p
 
         if d['buildapp'] == 'b2g':
             if d['toolkit'] == 'gonk':
                 return 'emulator'
 
             if d['bits'] == 64:
                 return 'linux64_gecko'
@@ -123,18 +127,16 @@ def build_dict(config, env=os.environ):
                 return 'android-x86'
             return 'android-arm'
 
     def guess_buildtype():
         if d['debug']:
             return 'debug'
         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 (d['os'] == 'mac' or 'bits' in d):
         d['platform_guess'] = guess_platform()
         d['buildtype_guess'] = guess_buildtype()