Bug 1510452 - Use srcdir_relpath instead of file_relpath for tests and test support files. r=ahal
authorMarco Castelluccio <mcastelluccio@mozilla.com>
Tue, 27 Nov 2018 23:53:33 +0100
changeset 507997 82bbee36c7dc5273252d761b6ec66da6f2b0ead5
parent 507996 9358169404d156136a8fe82ef43fb78523123cc1
child 507998 c8752ec31af8548218ecf577b5132a5705c30bd7
push id1905
push userffxbld-merge
push dateMon, 21 Jan 2019 12:33:13 +0000
treeherdermozilla-release@c2fca1944d8c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersahal
bugs1510452
milestone65.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 1510452 - Use srcdir_relpath instead of file_relpath for tests and test support files. r=ahal
tools/tryselect/selectors/coverage.py
--- a/tools/tryselect/selectors/coverage.py
+++ b/tools/tryselect/selectors/coverage.py
@@ -69,38 +69,38 @@ def read_test_manifests():
                         test files that require them it
     '''
     test_resolver = TestResolver.from_environment(cwd=here)
     file_finder = FileFinder(build.topsrcdir)
     support_files_map = collections.defaultdict(list)
     tests = set()
 
     for test in test_resolver.resolve_tests(build.topsrcdir):
-        tests.add(test['file_relpath'])
+        tests.add(test['srcdir_relpath'])
         if 'support-files' not in test:
             continue
 
         for support_file_pattern in test['support-files'].split():
             # Get the pattern relative to topsrcdir.
             if support_file_pattern.startswith('!/'):
                 support_file_pattern = support_file_pattern[2:]
             elif support_file_pattern.startswith('/'):
                 support_file_pattern = support_file_pattern[1:]
             else:
                 support_file_pattern = os.path.normpath(os.path.join(test['dir_relpath'],
                                                                      support_file_pattern))
 
             # If it doesn't have a glob, then it's a single file.
             if '*' not in support_file_pattern:
                 # Simple case: single support file, just add it here.
-                support_files_map[support_file_pattern].append(test['file_relpath'])
+                support_files_map[support_file_pattern].append(test['srcdir_relpath'])
                 continue
 
             for support_file, _ in file_finder.find(support_file_pattern):
-                support_files_map[support_file].append(test['file_relpath'])
+                support_files_map[support_file].append(test['srcdir_relpath'])
 
     return tests, support_files_map
 
 
 # TODO cache the output of this function
 all_tests, all_support_files = read_test_manifests()