diff options
| author | George Burgess IV <gbiv@google.com> | 2024-04-03 09:48:37 -0600 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2024-04-08 15:01:44 +0000 |
| commit | 3f4382d0af07b86c5caf3f0e119c6473509037d8 (patch) | |
| tree | 33c1f51e255696a67a3806cab3f7f7b081ff981c | |
| parent | 0fc9b4d6e3b1d3817ba8ed5213a66800b89ad2c9 (diff) | |
| download | toolchain-utils-3f4382d0af07b86c5caf3f0e119c6473509037d8.tar.gz | |
llvm_tools: remove unused `patch_cmd` arg
This makes `cros lint` happy.
BUG=b:332589934
TEST=repo upload
Change-Id: Ic0b15dd0829f731b3387ca6b3df6dbca5688ea93
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/5420773
Commit-Queue: George Burgess <gbiv@chromium.org>
Tested-by: George Burgess <gbiv@chromium.org>
Reviewed-by: Jordan Abrahams-Whitehead <ajordanr@google.com>
| -rwxr-xr-x | llvm_tools/patch_manager.py | 4 | ||||
| -rwxr-xr-x | llvm_tools/patch_manager_unittest.py | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/llvm_tools/patch_manager.py b/llvm_tools/patch_manager.py index bee4c964..801f8469 100755 --- a/llvm_tools/patch_manager.py +++ b/llvm_tools/patch_manager.py @@ -115,7 +115,6 @@ def CheckPatchApplies( llvm_src_dir: Path, patches_json_fp: Path, rel_patch_path: str, - patch_cmd: Optional[Callable] = None, ) -> GitBisectionCode: """Check that a given patch with the rel_patch_path applies in the stack. @@ -131,7 +130,6 @@ def CheckPatchApplies( rel_patch_path: Relative patch path of the patch we want to check. If patches before this patch fail to apply, then the revision is skipped. - patch_cmd: Use 'git am' to patch instead of GNU 'patch'. """ with patches_json_fp.open(encoding="utf-8") as f: patch_entries = patch_utils.json_to_patch_entries( @@ -297,13 +295,11 @@ def main(sys_argv: List[str]): "Running with bisect_patches requires the " "--test_patch flag." ) svn_version = GetHEADSVNVersion(llvm_src_dir) - patch_cmd = patch_utils.git_am if args.git_am else patch_utils.gnu_patch error_code = CheckPatchApplies( svn_version, llvm_src_dir, patches_json_fp, args.test_patch, - patch_cmd, ) # Since this is for bisection, we want to exit with the # GitBisectionCode enum. diff --git a/llvm_tools/patch_manager_unittest.py b/llvm_tools/patch_manager_unittest.py index 1087727f..30acd24a 100755 --- a/llvm_tools/patch_manager_unittest.py +++ b/llvm_tools/patch_manager_unittest.py @@ -124,7 +124,6 @@ class PatchManagerTest(unittest.TestCase): dirpath, patches_path, "example.patch", - patch_utils.gnu_patch, ) self.assertEqual(result, expected) m.assert_called() @@ -165,7 +164,6 @@ class PatchManagerTest(unittest.TestCase): dirpath, patches_path, "example.patch", - patch_utils.gnu_patch, ) self.assertEqual(result, expected) |