Skip to content

Shift test_base library to testonly+basic_cc_library. #5865

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
htuch merged 5 commits into from
Feb 8, 2019
Merged

Shift test_base library to testonly+basic_cc_library. #5865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7ffc516
Shift test_base library to testonly+basic_cc_library.
Feb 6, 2019
7a3aa45
Kick CI
Feb 6, 2019
97de712
Kick CI
Feb 6, 2019
6668bf8
I think this works properly now.
Feb 7, 2019
151df82
Fix format
Feb 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 29 additions & 5 deletions bazel/envoy_build_system.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,9 +416,9 @@ def envoy_cc_test(
shard_count = shard_count,
)

# Envoy C++ test related libraries (that want gtest, gmock) should be specified
# with this function.
def envoy_cc_test_library(
# Envoy C++ related test infrastructure (that want gtest, gmock, but may be
# relied on by envoy_cc_test_library) should use this function.
def envoy_cc_test_infrastructure_library(
name,
srcs = [],
hdrs = [],
Expand All @@ -436,14 +436,38 @@ def envoy_cc_test_library(
testonly = 1,
deps = deps + [envoy_external_dep_path(dep) for dep in external_deps] + [
envoy_external_dep_path("googletest"),
repository + "//test/test_common:printers_includes",
repository + "//test/test_common:test_base",
],
tags = tags,
alwayslink = 1,
linkstatic = 1,
)

# Envoy C++ test related libraries (that want gtest, gmock) should be specified
# with this function.
def envoy_cc_test_library(
name,
srcs = [],
hdrs = [],
data = [],
external_deps = [],
deps = [],
repository = "",
tags = []):
deps = deps + [
repository + "//test/test_common:printers_includes",
repository + "//test/test_common:test_base",
]
envoy_cc_test_infrastructure_library(
name,
srcs,
hdrs,
data,
external_deps,
deps,
repository,
tags,
)

# Envoy test binaries should be specified with this function.
def envoy_cc_test_binary(
name,
Expand Down
4 changes: 2 additions & 2 deletions test/test_common/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ load(
"envoy_basic_cc_library",
"envoy_cc_library",
"envoy_cc_test",
"envoy_cc_test_infrastructure_library",
"envoy_cc_test_library",
"envoy_package",
)
Expand Down Expand Up @@ -156,12 +157,11 @@ envoy_cc_test(
],
)

envoy_cc_library(
envoy_cc_test_infrastructure_library(
name = "test_base",
srcs = ["test_base.cc"],
hdrs = ["test_base.h"],
deps = [
"//external:googletest",
"//test/test_common:global_lib",
],
)
Expand Down