Acceptance BUILD: Fix plugin standalone test exec

Before this change, the hereby moved package classes were not found,
while executing plugin tests in bazel standalone mode.

Bug: Issue 12218
Change-Id: I6143263b8c1f34e30d90191a62a894c1a4658114
This commit is contained in:
Marco Miller
2020-01-24 18:31:31 -05:00
parent e33d820d6e
commit a3a5ac5fbc
3 changed files with 15 additions and 6 deletions

View File

@@ -11,13 +11,9 @@ DEPLOY_ENV = [
"//java/com/google/gerrit/exceptions", "//java/com/google/gerrit/exceptions",
"//java/com/google/gerrit/gpg", "//java/com/google/gerrit/gpg",
"//java/com/google/gerrit/git", "//java/com/google/gerrit/git",
"//java/com/google/gerrit/httpd/auth/openid",
"//java/com/google/gerrit/index:query_exception", "//java/com/google/gerrit/index:query_exception",
"//java/com/google/gerrit/launcher", "//java/com/google/gerrit/launcher",
"//java/com/google/gerrit/lifecycle", "//java/com/google/gerrit/lifecycle",
"//java/com/google/gerrit/pgm",
"//java/com/google/gerrit/pgm/http/jetty",
"//java/com/google/gerrit/pgm/util",
"//java/com/google/gerrit/common:annotations", "//java/com/google/gerrit/common:annotations",
"//java/com/google/gerrit/common:server", "//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/entities", "//java/com/google/gerrit/entities",
@@ -51,7 +47,6 @@ DEPLOY_ENV = [
"//lib/guice", "//lib/guice",
"//lib/guice:guice-assistedinject", "//lib/guice:guice-assistedinject",
"//lib/guice:guice-servlet", "//lib/guice:guice-servlet",
"//lib/jetty:servlet",
"//lib/mail", "//lib/mail",
"//lib/mina:sshd", "//lib/mina:sshd",
"//lib/log:impl-log4j", "//lib/log:impl-log4j",
@@ -63,6 +58,10 @@ DEPLOY_ENV = [
] ]
TEST_DEPS = [ TEST_DEPS = [
"//java/com/google/gerrit/httpd/auth/openid",
"//java/com/google/gerrit/pgm",
"//java/com/google/gerrit/pgm/http/jetty",
"//java/com/google/gerrit/pgm/util",
"//java/com/google/gerrit/truth", "//java/com/google/gerrit/truth",
"//java/com/google/gerrit/acceptance/testsuite/project", "//java/com/google/gerrit/acceptance/testsuite/project",
"//java/com/google/gerrit/server/group/testing", "//java/com/google/gerrit/server/group/testing",
@@ -74,6 +73,13 @@ TEST_DEPS = [
"//java/com/google/gerrit/git/testing", "//java/com/google/gerrit/git/testing",
] ]
PGM_DEPLOY_ENV = [
"//lib:caffeine",
"//lib:caffeine-guava",
"//lib/jackson:jackson-core",
"//lib/prolog:cafeteria",
]
java_library( java_library(
name = "lib", name = "lib",
testonly = True, testonly = True,
@@ -98,7 +104,7 @@ java_binary(
name = "framework-deploy-env", name = "framework-deploy-env",
testonly = True, testonly = True,
main_class = "Dummy", main_class = "Dummy",
runtime_deps = DEPLOY_ENV, runtime_deps = DEPLOY_ENV + PGM_DEPLOY_ENV,
) )
java_library2( java_library2(

View File

@@ -114,6 +114,7 @@ java_library(
name = "caffeine", name = "caffeine",
data = ["//lib:LICENSE-Apache2.0"], data = ["//lib:LICENSE-Apache2.0"],
visibility = [ visibility = [
"//java/com/google/gerrit/acceptance:__pkg__",
"//java/com/google/gerrit/server/cache/mem:__pkg__", "//java/com/google/gerrit/server/cache/mem:__pkg__",
], ],
exports = ["@caffeine//jar"], exports = ["@caffeine//jar"],
@@ -128,6 +129,7 @@ java_library(
name = "caffeine-guava", name = "caffeine-guava",
data = ["//lib:LICENSE-Apache2.0"], data = ["//lib:LICENSE-Apache2.0"],
visibility = [ visibility = [
"//java/com/google/gerrit/acceptance:__pkg__",
"//java/com/google/gerrit/server/cache/mem:__pkg__", "//java/com/google/gerrit/server/cache/mem:__pkg__",
], ],
exports = [":caffeine-guava-renamed"], exports = [":caffeine-guava-renamed"],

View File

@@ -4,6 +4,7 @@ java_library(
name = "jackson-core", name = "jackson-core",
data = ["//lib:LICENSE-Apache2.0"], data = ["//lib:LICENSE-Apache2.0"],
visibility = [ visibility = [
"//java/com/google/gerrit/acceptance:__pkg__",
"//java/com/google/gerrit/elasticsearch:__pkg__", "//java/com/google/gerrit/elasticsearch:__pkg__",
"//plugins:__pkg__", "//plugins:__pkg__",
], ],