Skip to content

Commit

Permalink
Bug 1599242 - Fix edge case in test-verify reftest path substitution;…
Browse files Browse the repository at this point in the history
… r=jmaher

In a minority of cases, the referenced file (here, entry[2]) has a relative
path, <subdir>/<reference-file>; since it is being joined with the full
path to the original file, the <subdir> needs to be eliminated.

Differential Revision: https://phabricator.services.mozilla.com/D54611

--HG--
extra : moz-landing-system : lando
  • Loading branch information
gbrownmozilla committed Nov 25, 2019
1 parent de35b30 commit fc72f31
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ def _find_misc_tests(self, dirs, changed_files, gpu=False):
# Test name substitution, for reftest reference file handling:
# - if both test and reference modified, run the test file
# - if only reference modified, run the test file
test_file = os.path.join(os.path.dirname(file), entry[2])
test_file = os.path.join(os.path.dirname(file), os.path.basename(entry[2]))
self.info("Per-test run substituting %s for %s" % (test_file, file))
file = test_file

Expand Down

0 comments on commit fc72f31

Please sign in to comment.