зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1510452 - Use srcdir_relpath instead of file_relpath for tests and test support files. r=ahal
--HG-- extra : rebase_source : ec726b7b2a409e6e30dcdee2e5795eabacd56fb6
This commit is contained in:
Родитель
cd40821489
Коммит
04087c53c1
|
@ -74,7 +74,7 @@ def read_test_manifests():
|
||||||
tests = set()
|
tests = set()
|
||||||
|
|
||||||
for test in test_resolver.resolve_tests(build.topsrcdir):
|
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:
|
if 'support-files' not in test:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
@ -91,11 +91,11 @@ def read_test_manifests():
|
||||||
# If it doesn't have a glob, then it's a single file.
|
# If it doesn't have a glob, then it's a single file.
|
||||||
if '*' not in support_file_pattern:
|
if '*' not in support_file_pattern:
|
||||||
# Simple case: single support file, just add it here.
|
# 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
|
continue
|
||||||
|
|
||||||
for support_file, _ in file_finder.find(support_file_pattern):
|
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
|
return tests, support_files_map
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче