Bug 1370539 - Fix logic error around skipping package metrics; r?nalexander draft
authorGregory Szorc <gps@mozilla.com>
Tue, 06 Jun 2017 11:02:22 -0700
changeset 589736 4fdf69f8d75c09b7d7350b5b149ec44479247952
parent 589687 c511ad826fe71ba2bb956d2e1c119e86d2266aba
child 631988 eae01be1f89c625836ad0046471c95bce3c7650c
push id62486
push usergszorc@mozilla.com
push dateTue, 06 Jun 2017 18:02:50 +0000
reviewersnalexander
bugs1370539
milestone55.0a1
Bug 1370539 - Fix logic error around skipping package metrics; r?nalexander b227363d66bb added a config item and code for disabling package metrics, which don't work everywhere. The previous logic was faulty. MozReview-Commit-ID: BGxWgmWxXyH
testing/mozharness/mozharness/mozilla/building/buildbase.py
--- a/testing/mozharness/mozharness/mozilla/building/buildbase.py
+++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py
@@ -2028,17 +2028,17 @@ or run without that action (ie: --no-{ac
 
         perfherder_data = {
             "framework": {
                 "name": "build_metrics"
             },
             "suites": [],
         }
 
-        if not c.get('debug_build') or c.get('disable_package_metrics'):
+        if not c.get('debug_build') and not c.get('disable_package_metrics'):
             perfherder_data['suites'].extend(self._get_package_metrics())
 
         # Extract compiler warnings count.
         warnings = self.get_output_from_command(
             command=[sys.executable, 'mach', 'warnings-list'],
             cwd=self.query_abs_dirs()['abs_src_dir'],
             env=self.query_build_env(),
             # No need to pollute the log.