From 557f9121a50463cab54eaf1cc5907a3fb107f862 Mon Sep 17 00:00:00 2001 From: Nate Bosch Date: Tue, 10 Sep 2019 19:22:52 +0000 Subject: [PATCH] Add canned_checks.CheckPatchFormatted to presubmit This will include checks for python file formatting thanks to the presence of the `.style.yapf` file at the root of the repo. - Refactor to a `_CommonChecks` to reduce duplication and use `results.extend` so that each check is defined on its own line. - Add the `canned_checks.CheckPatchFormatted` check. See discussion at https://dart-review.googlesource.com/c/sdk/+/111600 Change-Id: I089112c309bf6b9a518c85fa6b66200b75519e33 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/116364 Reviewed-by: Jonas Termansen Commit-Queue: Nate Bosch --- PRESUBMIT.py | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/PRESUBMIT.py b/PRESUBMIT.py index 7beb3f87611..5bcc5dd2405 100644 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py @@ -250,16 +250,24 @@ def _CheckClangTidy(input_api, output_api): long_text=stdout) ] + +def _CommonChecks(input_api, output_api): + results = [] + results.extend(_CheckValidHostsInDEPS(input_api, output_api)) + results.extend(_CheckDartFormat(input_api, output_api)) + results.extend(_CheckStatusFiles(input_api, output_api)) + results.extend(_CheckLayering(input_api, output_api)) + results.extend(_CheckClangTidy(input_api, output_api)) + results.extend( + input_api.canned_checks.CheckPatchFormatted(input_api, output_api)) + return results + + def CheckChangeOnCommit(input_api, output_api): - return (_CheckValidHostsInDEPS(input_api, output_api) + _CheckBuildStatus( - input_api, output_api) + _CheckDartFormat(input_api, output_api) + - _CheckStatusFiles(input_api, output_api) + _CheckLayering( - input_api, output_api) + _CheckClangTidy( - input_api, output_api)) + results = _CommonChecks(input_api, output_api) + results.extend(_CheckBuildStatus(input_api, output_api)) + return results def CheckChangeOnUpload(input_api, output_api): - return (_CheckValidHostsInDEPS(input_api, output_api) + _CheckDartFormat( - input_api, output_api) + _CheckStatusFiles(input_api, output_api) + - _CheckLayering(input_api, output_api) + _CheckClangTidy( - input_api, output_api)) + return _CommonChecks(input_api, output_api)