commit 7624e2dace1eddb857ba092d4db07ade86891165
author George Burgess IV <gbiv@google.com> Thu Oct 08 11:18:36 2020 -0700
committer George Burgess <gbiv@chromium.org> Thu Oct 08 18:45:52 2020 +0000
tree 11751db9a67a4030b45928ec69dd11979a9444dc
parent 44e5787e5c98615899e512462491089e5c4dfb00

llvm_tools: use gsutil.py instead of gsutil

chrotomation.mtv has gsutil.py from depot_tools, and no pre-installed
gsutil. seems easiest to just add another dependency on gsutil.py.

BUG=None
TEST=Ran on chrotomation

Change-Id: I9833c0fb1e11d31b3a4c17375e0f296ff5a83a8e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/2462043
Reviewed-by: Manoj Gupta <manojgupta@chromium.org>
Tested-by: George Burgess <gbiv@chromium.org>

llvm_tools/bisect_clang_crashes.py

diff --git a/llvm_tools/bisect_clang_crashes.py b/llvm_tools/bisect_clang_crashes.py
index 4d47c4c..e8ee2ab 100755
--- a/llvm_tools/bisect_clang_crashes.py
+++ b/llvm_tools/bisect_clang_crashes.py
@@ -23,7 +23,7 @@
 
 
 def get_artifacts(pattern):
-  results = subprocess.check_output(['gsutil', 'ls', pattern],
+  results = subprocess.check_output(['gsutil.py', 'ls', pattern],
                                     stderr=subprocess.STDOUT,
                                     encoding='utf-8')
   return sorted(l.strip() for l in results.splitlines())
@@ -48,7 +48,7 @@
   dest_dir = os.path.join(temporary_directory, buildbucket_id)
   dest_file = os.path.join(dest_dir, os.path.basename(url))
   logging.info('Downloading and submitting %r...', url)
-  subprocess.check_output(['gsutil', 'cp', url, dest_file],
+  subprocess.check_output(['gsutil.py', 'cp', url, dest_file],
                           stderr=subprocess.STDOUT)
   subprocess.check_output(['tar', '-xJf', dest_file], cwd=dest_dir)
   for src, script in get_crash_reproducers(dest_dir):

llvm_tools/bisect_clang_crashes_unittest.py

diff --git a/llvm_tools/bisect_clang_crashes_unittest.py b/llvm_tools/bisect_clang_crashes_unittest.py
index 66923ff..c914345 100755
--- a/llvm_tools/bisect_clang_crashes_unittest.py
+++ b/llvm_tools/bisect_clang_crashes_unittest.py
@@ -40,7 +40,7 @@
     mock_gsutil_ls.return_value = 'artifact1\nartifact2\nartifact3'
     results = bisect_clang_crashes.get_artifacts(pattern)
     self.assertEqual(results, ['artifact1', 'artifact2', 'artifact3'])
-    mock_gsutil_ls.assert_called_once_with(['gsutil', 'ls', pattern],
+    mock_gsutil_ls.assert_called_once_with(['gsutil.py', 'ls', pattern],
                                            stderr=subprocess.STDOUT,
                                            encoding='utf-8')
 

llvm_tools/upload_lexan_crashes_to_forcey.py

diff --git a/llvm_tools/upload_lexan_crashes_to_forcey.py b/llvm_tools/upload_lexan_crashes_to_forcey.py
index 9cf0c08..216511f 100755
--- a/llvm_tools/upload_lexan_crashes_to_forcey.py
+++ b/llvm_tools/upload_lexan_crashes_to_forcey.py
@@ -24,7 +24,7 @@
 
 
 def gsutil_ls(loc: str) -> List[str]:
-  results = subprocess.run(['gsutil', 'ls', loc],
+  results = subprocess.run(['gsutil.py', 'ls', loc],
                            stdout=subprocess.PIPE,
                            check=True,
                            encoding='utf-8')
@@ -107,7 +107,7 @@
   with temp_dir() as tempdir:
     target_name = 'test_case' + suffix
     target = os.path.join(tempdir, target_name)
-    subprocess.run(['gsutil', 'cp', gs_url, target], check=True)
+    subprocess.run(['gsutil.py', 'cp', gs_url, target], check=True)
     subprocess.run(['tar', 'xaf', target_name], check=True, cwd=tempdir)
     os.unlink(target)