Support proguard 5.3.3 or 6.2.2 in the tests

Pulling this out bazelbuild#12509 so that it's easier to merge and sync Closes bazelbuild#12909. PiperOrigin-RevId: 354209205
ptarjan · Jan 28, 2021 · fdde5af · fdde5af
1 parent 13aba68
commit fdde5af
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/test/shell/bazel/bazel_java_tools_dist_test.sh b/src/test/shell/bazel/bazel_java_tools_dist_test.sh
@@ -147,13 +147,14 @@ function test_java_tools_has_jacocoagent() {
   expect_path_in_java_tools "third_party/asm/asm-8.0-sources.jar"
 }
 
+# TODO(bencodes) This test should assert against a 6.2.2 after proguard is switched over
 function test_java_tools_has_proguard() {
   expect_path_in_java_tools "third_party/java/proguard"
-  expect_path_in_java_tools "third_party/java/proguard/proguard5.3.3"
-  expect_path_in_java_tools "third_party/java/proguard/proguard5.3.3/bin"
-  expect_path_in_java_tools "third_party/java/proguard/proguard5.3.3/buildscripts"
-  expect_path_in_java_tools "third_party/java/proguard/proguard5.3.3/src"
-  expect_path_in_java_tools "third_party/java/proguard/proguard5.3.3/src/proguard"
+  expect_path_in_java_tools "third_party/java/proguard/proguard.*"
+  expect_path_in_java_tools "third_party/java/proguard/proguard.*/bin"
+  expect_path_in_java_tools "third_party/java/proguard/proguard.*/buildscripts"
+  expect_path_in_java_tools "third_party/java/proguard/proguard.*/src"
+  expect_path_in_java_tools "third_party/java/proguard/proguard.*/src/proguard"
 }
 
 run_suite "Java tools archive tests"
diff --git a/src/test/shell/bazel/bazel_java_tools_test.sh b/src/test/shell/bazel/bazel_java_tools_test.sh
@@ -187,9 +187,10 @@ function test_java_tools_has_jacocoagent() {
   expect_path_in_java_tools "java_tools/third_party/java/jacoco/LICENSE"
 }
 
+# TODO(bencodes) This test should assert against a 6.2.2 after proguard is switched over
 function test_java_tools_has_proguard() {
   expect_path_in_java_tools "java_tools/third_party/java/proguard/proguard.jar"
-  expect_path_in_java_tools "java_tools/third_party/java/proguard/GPL.html"
+  expect_path_in_java_tools "java_tools/third_party/java/proguard/GPL.*"
 }
 
 function test_java_tools_toolchain_builds() {