From aaee257ccd25e926e1b69de5ef3cdc165a056642 Mon Sep 17 00:00:00 2001 From: Geoff Brown Date: Thu, 21 Dec 2017 12:32:04 -0700 Subject: [PATCH] Bug 1426120 - Update test-verify so that -ref files do not trigger re-verification of non-ref file; r=jmaher Build and store full paths before searching for reference files and trying to match them to test files. --- .../mozharness/mozilla/testing/verify_tools.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/testing/mozharness/mozharness/mozilla/testing/verify_tools.py b/testing/mozharness/mozharness/mozilla/testing/verify_tools.py index ac6909f65735..dfb677241be3 100644 --- a/testing/mozharness/mozharness/mozilla/testing/verify_tools.py +++ b/testing/mozharness/mozharness/mozilla/testing/verify_tools.py @@ -189,14 +189,17 @@ class VerifyToolsMixin(object): # in verify mode, run nothing by default (unsupported suite or no files modified) args = [] # otherwise, run once for each file in requested suite - files = self.verify_suites.get(suite) references = re.compile(r"(-ref|-noref|-noref.)\.") + files = [] + for file in self.verify_suites.get(suite): + if (self.config.get('verify_category') != "web-platform" and + suite in ['reftest', 'crashtest']): + file = os.path.join(self.reftest_test_dir, file) + files.append(file) for file in files: if self.config.get('verify_category') == "web-platform": args.append(['--verify-log-full', '--verify', file]) else: - if suite in ['reftest', 'crashtest']: - file = os.path.join(self.reftest_test_dir, file) if suite == 'reftest': # Special handling for modified reftest reference files: # - if both test and reference modified, verify the test file