From 0250a0811ec394a69b85b56fb78d4f7d366da70b Mon Sep 17 00:00:00 2001 From: Ray Milkey Date: Wed, 27 Jun 2018 17:36:01 -0700 Subject: [PATCH] Fix dependencies of some bazel tests Change-Id: If864b37c08db73620c07a17174130024571a8d38 --- BUILD | 2 +- apps/pce/app/BUILD | 6 +++++- drivers/default/BUILD | 2 +- protocols/pcep/server/ctl/BUILD | 6 ++++++ providers/pcep/topology/BUILD | 6 ++++++ providers/pcep/tunnel/BUILD | 3 +++ 6 files changed, 22 insertions(+), 3 deletions(-) diff --git a/BUILD b/BUILD index 4e8af2158e..303f1f8c6c 100644 --- a/BUILD +++ b/BUILD @@ -1,5 +1,5 @@ load("//tools/build/bazel:generate_workspace.bzl", "ONOS_VERSION") -load(":modules.bzl", "APPS", "CORE", ) +load(":modules.bzl", "APPS", "CORE") filegroup( name = "onos", diff --git a/apps/pce/app/BUILD b/apps/pce/app/BUILD index 1c3e14b5a3..bdce3250fe 100644 --- a/apps/pce/app/BUILD +++ b/apps/pce/app/BUILD @@ -9,8 +9,12 @@ COMPILE_DEPS = CORE_DEPS + JACKSON + KRYO + [ "//apps/pce/bandwidthmgmt:onos-apps-pce-bandwidthmgmt", ] +TEST_DEPS = TEST_REST + [ + "//incubator/api:onos-incubator-api-tests", +] + osgi_jar_with_tests( - test_deps = TEST_REST, + test_deps = TEST_DEPS, deps = COMPILE_DEPS, ) diff --git a/drivers/default/BUILD b/drivers/default/BUILD index e5649d257d..ccb093f4af 100644 --- a/drivers/default/BUILD +++ b/drivers/default/BUILD @@ -24,4 +24,4 @@ onos_app( included_bundles = BUNDLES, title = "Default Drivers", url = "http://onosproject.org", -) \ No newline at end of file +) diff --git a/protocols/pcep/server/ctl/BUILD b/protocols/pcep/server/ctl/BUILD index 45562dcbba..13a7fa3868 100644 --- a/protocols/pcep/server/ctl/BUILD +++ b/protocols/pcep/server/ctl/BUILD @@ -7,6 +7,12 @@ COMPILE_DEPS = CORE_DEPS + NETTY + JACKSON + KRYO + [ "//apps/pcep-api:onos-apps-pcep-api", ] +TEST_DEPS = TEST_ADAPTERS + [ + "//protocols/pcep/server/api:onos-protocols-pcep-server-api-tests", + "//incubator/api:onos-incubator-api-tests", +] + osgi_jar_with_tests( + test_deps = TEST_DEPS, deps = COMPILE_DEPS, ) diff --git a/providers/pcep/topology/BUILD b/providers/pcep/topology/BUILD index e278d5cc0b..784b25772e 100644 --- a/providers/pcep/topology/BUILD +++ b/providers/pcep/topology/BUILD @@ -10,6 +10,12 @@ COMPILE_DEPS = CORE_DEPS + NETTY + JACKSON + [ "//apps/optical-model:onos-apps-optical-model", ] +TEST_DEPS = TEST + [ + "//protocols/pcep/server/api:onos-protocols-pcep-server-api-tests", + "//apps/pcep-api:onos-apps-pcep-api-tests", +] + osgi_jar_with_tests( + test_deps = TEST_DEPS, deps = COMPILE_DEPS, ) diff --git a/providers/pcep/tunnel/BUILD b/providers/pcep/tunnel/BUILD index b33bd8f87c..fb2e4146ec 100644 --- a/providers/pcep/tunnel/BUILD +++ b/providers/pcep/tunnel/BUILD @@ -11,6 +11,9 @@ COMPILE_DEPS = CORE_DEPS + NETTY + [ TEST_DEPS = TEST_ADAPTERS + [ "@netty//jar", "@netty_transport//jar", + "//protocols/pcep/server/api:onos-protocols-pcep-server-api-tests", + "//apps/pcep-api:onos-apps-pcep-api-tests", + "//incubator/api:onos-incubator-api-tests", ] osgi_jar_with_tests(