Skip to content

Commit

Permalink
some minor missed dll_deps additions
Browse files Browse the repository at this point in the history
  • Loading branch information
malkia committed Aug 22, 2023
1 parent 2131c8b commit 99d1fc6
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 19 deletions.
2 changes: 1 addition & 1 deletion BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ pkg_zip(

cc_binary(
name = "dll_deps_update_binary",
srcs = ["dll_deps_update.cpp"],
srcs = ["dll_deps_update.cc"],
data = ["otel_sdk_all_project_deps"],
local_defines = ['DEPS_FILE=\\"$(rlocationpath otel_sdk_all_project_deps)\\"'],
deps = ["@bazel_tools//tools/cpp/runfiles"],
Expand Down
8 changes: 4 additions & 4 deletions api/test/singleton/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,9 @@ cc_binary(
"//conditions:default": DEFAULT_NOWIN_COPTS,
}),
linkshared = True,
deps = [
deps = dll_deps([
"//api",
],
]),
)

# no cc_shared_library in bazel 4.2
Expand All @@ -146,9 +146,9 @@ cc_binary(
"//conditions:default": HIDDEN_NOWIN_COPTS,
}),
linkshared = True,
deps = [
deps = dll_deps([
"//api",
],
]),
)

#
Expand Down
File renamed without changes.
22 changes: 12 additions & 10 deletions opentracing-shim/BUILD
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0

load("//:dll_deps.bzl", "dll_deps")

package(default_visibility = ["//visibility:public"])

cc_library(
Expand Down Expand Up @@ -36,10 +38,10 @@ cc_test(
"opentracing_shim",
"test",
],
deps = [
deps = dll_deps([
":opentracing_shim",
"@com_google_googletest//:gtest_main",
],
]),
)

cc_test(
Expand All @@ -52,10 +54,10 @@ cc_test(
"opentracing_shim",
"test",
],
deps = [
deps = dll_deps([
":opentracing_shim",
"@com_google_googletest//:gtest_main",
],
]),
)

cc_test(
Expand All @@ -68,10 +70,10 @@ cc_test(
"opentracing_shim",
"test",
],
deps = [
deps = dll_deps([
":opentracing_shim",
"@com_google_googletest//:gtest_main",
],
]),
)

cc_test(
Expand All @@ -83,10 +85,10 @@ cc_test(
"opentracing_shim",
"test",
],
deps = [
deps = dll_deps([
":opentracing_shim",
"@com_google_googletest//:gtest_main",
],
]),
)

cc_test(
Expand All @@ -99,8 +101,8 @@ cc_test(
"opentracing_shim",
"test",
],
deps = [
deps = dll_deps([
":opentracing_shim",
"@com_google_googletest//:gtest_main",
],
]),
)
1 change: 0 additions & 1 deletion otel_sdk_build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ rem Note that `otel_sdk.zip` is built here for the default fastdbg (e.g. when no
"%__BAZEL__%" build --//:with_dll=true ... || goto:error

rem We can't test dbg, fastbuild and opt at the same time, as done above ^^^ (no config "transition" possible when doing testing (AFAIK))
rem TODO: Fix failing tests in debug only (e.g. add back the || goto:error)
"%__BAZEL__%" test --//:with_dll=true --test_size_filters=small,medium,large,enormous --test_timeout_filters=short,moderate,long,eternal --test_verbose_timeout_warnings -c dbg ... || goto:error
"%__BAZEL__%" test --//:with_dll=true --test_size_filters=small,medium,large,enormous --test_timeout_filters=short,moderate,long,eternal --test_verbose_timeout_warnings -c fastbuild ... || goto:error
"%__BAZEL__%" test --//:with_dll=true --test_size_filters=small,medium,large,enormous --test_timeout_filters=short,moderate,long,eternal --test_verbose_timeout_warnings -c opt ... || goto:error
Expand Down
6 changes: 3 additions & 3 deletions sdk/test/common/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ cc_test(
"base64_test.cc",
],
tags = ["test"],
deps = [
deps = dll_deps([
"//sdk/src/common:base64",
"@com_google_googletest//:gtest_main",
],
]),
)

cc_test(
Expand All @@ -47,7 +47,7 @@ otel_cc_benchmark(
"benchmark",
"test",
],
deps = ["//sdk/src/common:base64"],
deps = dll_deps(["//sdk/src/common:base64"]),
)

otel_cc_benchmark(
Expand Down

0 comments on commit 99d1fc6

Please sign in to comment.