Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

remove allfiles option for clang-format

Browse source
This commit is contained in:
Paul Rouget 2019-11-04 12:44:52 +01:00
parent f626355b67
commit b1753fea2d
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
python/servo/testing_commands.py
View file

@ -341,7 +341,7 @@ class MachCommands(CommandBase):
clangfmt_failed = False clangfmt_failed = False
if not no_cpp: if not no_cpp:
available, cmd, files = setup_clangfmt(all_files) available, cmd, files = setup_clangfmt()
if available: if available:
for file in files: for file in files:
stdout = subprocess.check_output([cmd, "-output-replacements-xml", file]) stdout = subprocess.check_output([cmd, "-output-replacements-xml", file])
@ -480,7 +480,7 @@ class MachCommands(CommandBase):
def format_code(self, no_cpp): def format_code(self, no_cpp):
if not no_cpp: if not no_cpp:
available, cmd, files = setup_clangfmt(True) available, cmd, files = setup_clangfmt()
if available and len(files) > 0: if available and len(files) > 0:
check_call([cmd, "-i"] + files) check_call([cmd, "-i"] + files)
@ -797,7 +797,7 @@ def create_parser_create():
return p return p
def setup_clangfmt(all_files): def setup_clangfmt():
cmd = "clang-format.exe" if sys.platform == "win32" else "clang-format" cmd = "clang-format.exe" if sys.platform == "win32" else "clang-format"
try: try:
version = subprocess.check_output([cmd, "--version"]).rstrip() version = subprocess.check_output([cmd, "--version"]).rstrip()
@ -809,8 +809,6 @@ def setup_clangfmt(all_files):
print("clang-format not installed. Skipping CPP formatting.") print("clang-format not installed. Skipping CPP formatting.")
return False, None, None return False, None, None
gitcmd = ['git', 'ls-files'] gitcmd = ['git', 'ls-files']
if not all_files:
gitcmd.append('-m')
gitfiles = subprocess.check_output(gitcmd + CLANGFMT_CPP_DIRS).splitlines() gitfiles = subprocess.check_output(gitcmd + CLANGFMT_CPP_DIRS).splitlines()
filtered = [line for line in gitfiles if line.endswith(".h") or line.endswith(".cpp")] filtered = [line for line in gitfiles if line.endswith(".h") or line.endswith(".cpp")]
return True, cmd, filtered return True, cmd, filtered