Try using python3 to run the upload script on windows for failing jar equality
Bug: b/339126537
Change-Id: I4349c140a957d24742c013646ac5622d9c3dcafd
diff --git a/src/test/testbase/java/com/android/tools/r8/ToolHelper.java b/src/test/testbase/java/com/android/tools/r8/ToolHelper.java
index ded4662..b8eb897 100644
--- a/src/test/testbase/java/com/android/tools/r8/ToolHelper.java
+++ b/src/test/testbase/java/com/android/tools/r8/ToolHelper.java
@@ -2703,13 +2703,16 @@
/** This code only works if run with depot_tools on the path */
public static String uploadFileToGoogleCloudStorage(String bucket, Path file) throws IOException {
- ImmutableList.Builder<String> command =
- new ImmutableList.Builder<String>()
- .add("upload_to_google_storage.py")
- .add("-f")
- .add("--bucket")
- .add(bucket)
- .add(file.toAbsolutePath().toString());
+ ImmutableList.Builder<String> command = new ImmutableList.Builder<>();
+ if (isWindows()) {
+ command.add("python3");
+ }
+ command
+ .add("upload_to_google_storage.py")
+ .add("-f")
+ .add("--bucket")
+ .add(bucket)
+ .add(file.toAbsolutePath().toString());
ProcessResult result = ToolHelper.runProcess(new ProcessBuilder(command.build()));
if (result.exitCode != 0) {
throw new RuntimeException(
