Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-22 06:43:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #11621 - h4xr:mach_fix, r=Wafflespeanut

Browse source 
Make mach test-tidy consider ignored dirs

Made changes so that mach test-tidy considers the ignored directories

Fixes #11386

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11621)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-06-14 23:33:52 -05:00 • committed by GitHub
commit bc2f4c3450
3 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
python/tidy/servo_tidy/tidy.py
View file

@ -650,11 +650,12 @@ def get_file_list(directory, only_changed_files=False, exclude_dirs=[]):
args = ["git", "ls-files", "--others", "--exclude-standard", directory]
file_list += subprocess.check_output(args)
for f in file_list.splitlines():
yield os.path.join('.', f)
if os.path.join('.', os.path.dirname(f)) not in ignored_dirs:
yield os.path.join('.', f)
elif exclude_dirs:
for root, dirs, files in os.walk(directory, topdown=True):
# modify 'dirs' in-place so that we don't do unwanted traversals in excluded directories
dirs[:] = [d for d in dirs if not any(os.path.join(root, d).startswith(name) for name in ignored_dirs)]
dirs[:] = [d for d in dirs if not any(os.path.join(root, d).startswith(name) for name in exclude_dirs)]
for rel_path in files:
yield os.path.join(root, rel_path)
else: