Skip to content

iox-#2432: Fix bazel build for --incompatible_disallow_empty_glob #2433

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

iox-#2432: Fix bazel build for --incompatible_disallow_empty_glob #2433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa15913
iox-#2432: Fix bazel build for `--incompatible_disallow_empty_glob`
lalten Mar 14, 2025
59eed8f
iox-#2432: Add release note
lalten Mar 14, 2025
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
1 change: 1 addition & 0 deletions doc/website/release-notes/iceoryx-unreleased.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@
- Fix windows performance issue [#2377](https://github.com/eclipse-iceoryx/iceoryx/issues/2377)
- Max Client and Server cannot be configured independently of Max Publisher and Subscriber [#2394](https://github.com/eclipse-iceoryx/iceoryx/issues/2394)
- Fix call to non-existing `getService` in channel.inl [#2426](https://github.com/eclipse-iceoryx/iceoryx/issues/2426)
- Fix Bazel build with `--incompatible_disallow_empty_glob` [#2433](https://github.com/eclipse-iceoryx/iceoryx/issues/2433)

**Refactoring:**

Expand Down
51 changes: 26 additions & 25 deletions iceoryx_binding_c/test/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,31 @@
#
# SPDX-License-Identifier: Apache-2.0

load("@rules_cc//cc:defs.bzl", "cc_test")
load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test")

cc_library(
name = "test",
testonly = True,
hdrs = ["test.hpp"],
includes = ["."],
deps = ["@googletest//:gtest"],
)

cc_library(
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Love seeing some of these targets split out 🙂

name = "mocks",
testonly = True,
hdrs = ["mocks/wait_set_mock.hpp"],
includes = ["mocks"],
deps = [
"//iceoryx_binding_c",
"//iceoryx_posh",
],
)

cc_test(
name = "binding_c_moduletests",
srcs = glob([
"moduletests/*.cpp",
"moduletests/*.hpp",
"mocks/*.hpp",
"*.hpp",
]),
includes = [
".",
"mocks",
"moduletests",
],
srcs = glob(["moduletests/*"]),
includes = ["moduletests"],
linkopts = select({
"//iceoryx_platform:linux": ["-ldl"],
"//iceoryx_platform:mac": ["-ldl"],
Expand All @@ -38,8 +48,9 @@ cc_test(
"//conditions:default": ["-ldl"],
}),
tags = ["exclusive"],
visibility = ["//visibility:private"],
deps = [
":mocks",
":test",
"//iceoryx_binding_c",
"//iceoryx_hoofs:iceoryx_hoofs_testing",
"//iceoryx_posh",
Expand All @@ -50,17 +61,7 @@ cc_test(

cc_test(
name = "binding_c_integrationtests",
srcs = glob([
"integrationtests/*.cpp",
"integrationtests/*.hpp",
"mocks/*.hpp",
"*.hpp",
]),
includes = [
".",
"integrationtests",
"mocks",
],
srcs = ["integrationtests/main_test_binding_c_integration.cpp"],
linkopts = select({
"//iceoryx_platform:linux": ["-ldl"],
"//iceoryx_platform:mac": ["-ldl"],
Expand All @@ -70,8 +71,8 @@ cc_test(
"//conditions:default": ["-ldl"],
}),
tags = ["exclusive"],
visibility = ["//visibility:private"],
deps = [
":test",
"//iceoryx_binding_c",
"//iceoryx_hoofs:iceoryx_hoofs_testing",
"//iceoryx_posh",
Expand Down
32 changes: 8 additions & 24 deletions iceoryx_hoofs/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,30 +31,14 @@ configure_file(

cc_library(
name = "iceoryx_hoofs",
srcs = glob([
"cli/source/*.cpp",
"concurrent/buffer/source/*.cpp",
"concurrent/sync/source/*.cpp",
"design/source/*.cpp",
"filesystem/source/*.cpp",
"memory/source/*.cpp",
"posix/auth/source/*.cpp",
"posix/design/source/*.cpp",
"posix/filesystem/source/*.cpp",
"posix/ipc/source/*.cpp",
"posix/sync/source/*.cpp",
"posix/time/source/*.cpp",
"posix/utility/source/*.cpp",
"posix/vocabulary/source/*.cpp",
"primitives/source/*.cpp",
"reporting/source/*.cpp",
"time/source/*.cpp",
"utility/source/*.cpp",
"vocabulary/source/**/*.cpp",
]),
hdrs = glob(["buffer/**"]) + glob(["cli/**"]) + glob(["concurrent/**"]) + glob(["container/**"]) + glob(["design/**"]) + glob(["filesystem/**"]) + glob(["functional/**"]) + glob(["legacy/**"]) + glob(["memory/**"]) + glob(["posix/**"]) + glob(["primitives/**"]) + glob(["reporting/**"]) + glob(["time/**"]) + glob(["utility/**"]) + glob(["vocabulary/**"]) + [
":iceoryx_hoofs_deployment_hpp",
],
srcs = glob(
[
"**/*.cpp",
"**/*.inl",
],
exclude = ["testing/**/*"],
),
hdrs = glob(["**/*.hpp"]) + [":iceoryx_hoofs_deployment_hpp"],
includes = [
"buffer/include/",
"cli/include/",
Expand Down
42 changes: 19 additions & 23 deletions iceoryx_hoofs/test/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@
#
# SPDX-License-Identifier: Apache-2.0

load("@rules_cc//cc:defs.bzl", "cc_test")
load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test")

cc_library(
name = "test",
testonly = True,
hdrs = ["test.hpp"],
includes = ["."],
deps = ["@googletest//:gtest"],
)

cc_test(
name = "hoofs_moduletests",
srcs = glob([
"moduletests/*.cpp",
"moduletests/*.hpp",
"*.hpp",
]),
includes = [
".",
"moduletests",
],
srcs = glob(["moduletests/**/*"]),
linkopts = select({
"//iceoryx_platform:linux": ["-ldl"],
"//iceoryx_platform:mac": [],
Expand All @@ -39,21 +39,15 @@ cc_test(
"exclusive",
"requires-fakeroot",
],
visibility = ["//visibility:private"],
deps = ["//iceoryx_hoofs:iceoryx_hoofs_testing"],
deps = [
":test",
"//iceoryx_hoofs:iceoryx_hoofs_testing",
],
)

cc_test(
name = "hoofs_integrationtests",
srcs = glob([
"integrationtests/*.cpp",
"integrationtests/*.hpp",
"*.hpp",
]),
includes = [
".",
"integrationtests",
],
srcs = ["integrationtests/main_test_hoofs_integration.cpp"],
linkopts = select({
"//iceoryx_platform:linux": ["-ldl"],
"//iceoryx_platform:mac": [],
Expand All @@ -63,6 +57,8 @@ cc_test(
"//conditions:default": ["-ldl"],
}),
tags = ["exclusive"],
visibility = ["//visibility:private"],
deps = ["//iceoryx_hoofs:iceoryx_hoofs_testing"],
deps = [
":test",
"//iceoryx_hoofs:iceoryx_hoofs_testing",
],
)
11 changes: 1 addition & 10 deletions iceoryx_hoofs/test/stresstests/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,12 @@ cc_test(
"//conditions:default": ["-ldl"],
}),
tags = ["exclusive"],
visibility = ["//visibility:private"],
deps = ["//iceoryx_hoofs:iceoryx_hoofs_testing"],
)

cc_test(
name = "hoofs_stresstests",
srcs = glob([
"*.cpp",
"*.hpp",
]),
includes = [
".",
"stresstests",
],
srcs = glob(["*.cpp"]),
linkopts = select({
"//iceoryx_platform:linux": ["-ldl"],
"//iceoryx_platform:mac": [],
Expand All @@ -63,6 +55,5 @@ cc_test(
"//conditions:default": ["-ldl"],
}),
tags = ["exclusive"],
visibility = ["//visibility:private"],
deps = ["//iceoryx_hoofs:iceoryx_hoofs_testing"],
)
39 changes: 13 additions & 26 deletions iceoryx_platform/test/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,19 @@
#
# SPDX-License-Identifier: Apache-2.0

load("@rules_cc//cc:defs.bzl", "cc_test")
load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test")

cc_library(
name = "test",
testonly = True,
hdrs = ["test.hpp"],
includes = ["."],
deps = ["@googletest//:gtest"],
)

cc_test(
name = "platform_moduletests",
srcs = glob([
"moduletests/*.cpp",
"moduletests/*.hpp",
"*.hpp",
]),
data = glob(["input/**"]),
includes = [
".",
"moduletests",
],
srcs = glob(["moduletests/*.cpp"]),
linkopts = select({
"//iceoryx_platform:linux": ["-ldl"],
"//iceoryx_platform:mac": [],
Expand All @@ -37,37 +36,25 @@ cc_test(
"//conditions:default": ["-ldl"],
}),
tags = ["exclusive"],
visibility = ["//visibility:private"],
deps = [
":test",
"//iceoryx_platform",
"@googletest//:gtest",
],
)

cc_test(
name = "platform_integrationtests",
srcs = glob([
"integrationtests/*.cpp",
"integrationtests/*.hpp",
"*.hpp",
]),
data = glob(["input/**"]),
includes = [
".",
"integrationtests",
],
srcs = ["integrationtests/main_test_platform_integration.cpp"],
linkopts = select({
"//iceoryx_platform:linux": ["-ldl"],
"//iceoryx_platform:mac": [],
"//iceoryx_platform:qnx": [],
"//iceoryx_platform:unix": [],
"//iceoryx_platform:win": [],
"//conditions:default": ["-ldl"],
}),
tags = ["exclusive"],
visibility = ["//visibility:private"],
deps = [
":test",
"//iceoryx_platform",
"@googletest//:gtest",
],
)
2 changes: 0 additions & 2 deletions iceoryx_posh/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,7 @@ cc_library(
name = "iceoryx_posh",
srcs = glob(
[
"source/log/**",
"source/capro/**",
"source/error_handling/**",
"source/mepoo/**",
"source/popo/**",
"source/version/**",
Expand Down
31 changes: 12 additions & 19 deletions iceoryx_posh/test/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,15 @@
#
# SPDX-License-Identifier: Apache-2.0

load("@rules_cc//cc:defs.bzl", "cc_test")
load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test")

cc_library(
name = "test",
testonly = True,
hdrs = ["test.hpp"],
includes = ["."],
deps = ["@googletest//:gtest"],
)

cc_test(
name = "posh_moduletests",
Expand All @@ -25,13 +33,6 @@ cc_test(
"stubs/*.hpp",
"*.hpp",
]),
data = glob(["input/**"]),
includes = [
".",
"mocks",
"moduletests",
"stubs",
],
linkopts = select({
"//iceoryx_platform:linux": ["-ldl"],
"//iceoryx_platform:mac": [],
Expand All @@ -41,8 +42,8 @@ cc_test(
"//conditions:default": ["-ldl"],
}),
tags = ["exclusive"],
visibility = ["//visibility:private"],
deps = [
":test",
"//iceoryx_hoofs:iceoryx_hoofs_testing",
"//iceoryx_posh",
"//iceoryx_posh:iceoryx_posh_config",
Expand All @@ -55,15 +56,7 @@ cc_test(
cc_test(
name = "posh_integrationtests",
timeout = "long",
srcs = glob([
"integrationtests/*.cpp",
"integrationtests/*.hpp",
"*.hpp",
]),
includes = [
".",
"integrationtests",
],
srcs = glob(["integrationtests/*"]),
linkopts = select({
"//iceoryx_platform:linux": ["-ldl"],
"//iceoryx_platform:mac": [],
Expand All @@ -73,8 +66,8 @@ cc_test(
"//conditions:default": ["-ldl"],
}),
tags = ["exclusive"],
visibility = ["//visibility:private"],
deps = [
":test",
"//iceoryx_hoofs:iceoryx_hoofs_testing",
"//iceoryx_posh",
"//iceoryx_posh:iceoryx_posh_gateway",
Expand Down
Loading