Fix shell tests that uses junit and hamcrest jars

bazelbuild · Mar 22, 2023 · 4894d27 · 4894d27
1 parent a53855c
commit 4894d27
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD
@@ -49,6 +49,8 @@ filegroup(
     name = "test-deps-wo-bazel",
     testonly = 1,
     srcs = [
+        ":junit_jar",
+        ":hamcrest_jar",
         "cc_api_rules.bzl",
         "remote_helpers.sh",
         "testing_server.py",
@@ -73,6 +75,20 @@ filegroup(
     ],
 )
 
+genrule(
+    name = "junit_jar",
+    srcs = ["@maven//:junit_junit_file"],
+    outs = ["junit.jar"],
+    cmd = "cp $< $@",
+)
+
+genrule(
+    name = "hamcrest_jar",
+    srcs = ["@maven//:org_hamcrest_hamcrest_core_file"],
+    outs = ["hamcrest.jar"],
+    cmd = "cp $< $@",
+)
+
 sh_test(
     name = "bazel_symlink_test",
     size = "medium",

diff --git a/src/test/shell/testenv.sh.tmpl b/src/test/shell/testenv.sh.tmpl
@@ -116,11 +116,11 @@ protoc_compiler="${BAZEL_RUNFILES}/src/test/shell/integration/protoc"
 skylib_package="@bazel_skylib//"
 
 if [ -z ${RUNFILES_MANIFEST_ONLY+x} ]; then
-  junit_jar="${BAZEL_RUNFILES}/third_party/junit/junit-*.jar"
-  hamcrest_jar="${BAZEL_RUNFILES}/third_party/hamcrest/hamcrest-*.jar"
+  junit_jar="${BAZEL_RUNFILES}/src/test/shell/bazel/junit.jar"
+  hamcrest_jar="${BAZEL_RUNFILES}/src/test/shell/bazel/hamcrest.jar"
 else
-  junit_jar=$(rlocation io_bazel/third_party/junit/junit-.*.jar)
-  hamcrest_jar=$(rlocation io_bazel/third_party/hamcrest/hamcrest-.*.jar)
+  junit_jar=$(rlocation io_bazel/src/test/shell/bazel/junit.jar)
+  hamcrest_jar=$(rlocation io_bazel/src/test/shell/bazel/hamcrest.jar)
 fi