Bug 1149164 - Refine file size output for perfherder;r=gbrown

--HG--
extra : rebase_source : 3e4188f91eb958baefc8e39a7106364cc0bae258

testing/mozharness/mozharness/mozilla/building/buildbase.py

@@ -1609,20 +1609,26 @@ or run without that action (ie: --no-{action})"
             paths.append( ('libxul.so', os.path.join(dirs['abs_obj_dir'], 'dist', 'bin', 'libxul.so')) )
 
         size_measurements = []
+        installer_size = 0
         for (name, path) in paths:
             # FIXME: Remove the tinderboxprints when bug 1161249 is fixed and
             # we're displaying perfherder data for each job automatically
             if os.path.exists(path):
-                if 'apk' in name:
-                    name = 'apk'
                 filesize = self.query_filesize(path)
                 self.info('TinderboxPrint: Size of %s<br/>%s bytes\n' % (
                     name, filesize))
-                size_measurements.append({'name': name, 'value': filesize})
-        if size_measurements:
+                if any(name.endswith(extension) for extension in ['apk',
+                                                                  'dmg',
+                                                                  'bz2',
+                                                                  'zip']):
+                    installer_size = filesize
+                else:
+                    size_measurements.append({'name': name, 'value': filesize})
+        if filesize or size_measurements:
             self.info('PERFHERDER_DATA: %s' % (json.dumps({
                 "framework": {"name": "build_metrics"},
-                "suites": [{"name": "file sizes",
+                "suites": [{"name": "installer size",
+                            "value": installer_size,
                             "subtests": size_measurements}]
             })))