nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Backed out changeset 9b60a11f4550 (bug 1612077) for causing failures in mozlint/test/test_roller.py

Browse source
This commit is contained in:
Mihai Alexandru Michis 2020-02-28 16:18:12 +02:00
parent 9eac89a8fe
commit 45d339f5d6
1 changed files with 2 additions and 5 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

7
python/mozlint/mozlint/roller.py
View file

@ -202,20 +202,17 @@ class LintRoller(object):
return 0 return 0
def _generate_jobs(self, paths, vcs_paths, num_procs): def _generate_jobs(self, paths, vcs_paths, num_procs):
def __get_current_paths(path=self.root):
return [os.path.join(path, p) for p in os.listdir(path)]
"""A job is of the form (<linter:dict>, <paths:list>).""" """A job is of the form (<linter:dict>, <paths:list>)."""
for linter in self.linters: for linter in self.linters:
if any(os.path.isfile(p) and mozpath.match(p, pattern) if any(os.path.isfile(p) and mozpath.match(p, pattern)
for pattern in linter.get('support-files', []) for p in vcs_paths): for pattern in linter.get('support-files', []) for p in vcs_paths):
lpaths = __get_current_paths() lpaths = [self.root]
print("warning: {} support-file modified, linting entire tree " print("warning: {} support-file modified, linting entire tree "
"(press ctrl-c to cancel)".format(linter['name'])) "(press ctrl-c to cancel)".format(linter['name']))
else: else:
lpaths = paths.union(vcs_paths) lpaths = paths.union(vcs_paths)
lpaths = list(lpaths) or __get_current_paths(os.getcwd()) lpaths = list(lpaths) or [os.getcwd()]
chunk_size = min(self.MAX_PATHS_PER_JOB, int(ceil(len(lpaths) / num_procs))) or 1 chunk_size = min(self.MAX_PATHS_PER_JOB, int(ceil(len(lpaths) / num_procs))) or 1
if linter['type'] == 'global': if linter['type'] == 'global':
# Global linters lint the entire tree in one job. # Global linters lint the entire tree in one job.