[libc][bazel] Fold errno_test_helpers into LibcUnitTest. #158705
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
LibcUnitTest helper library already contains some logic for errno validation (ErrnoSetterMatcher.h), and since errno validation is used so extensively in various unit tests, it makes sense to fold ErrnoCheckingTest.h (which would be required for errno validation soon) there as well for simplicity.
vonosmas
requested review from
aaronmondal,
keith and
rupprecht
as code owners
|
@llvm/pr-subscribers-libc Author: Alexey Samsonov (vonosmas) ChangesLibcUnitTest helper library already contains some logic for errno validation (ErrnoSetterMatcher.h), and since errno validation is used so extensively in various unit tests, it makes sense to fold ErrnoCheckingTest.h (which would be required for errno validation soon) there as well for simplicity. Full diff: https://github.com/llvm/llvm-project/pull/158705.diff 6 Files Affected:
diff --git a/utils/bazel/llvm-project-overlay/libc/test/UnitTest/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/test/UnitTest/BUILD.bazel
index 318397615d0e3..b44273123dcad 100644
--- a/utils/bazel/llvm-project-overlay/libc/test/UnitTest/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/libc/test/UnitTest/BUILD.bazel
@@ -39,6 +39,7 @@ libc_test_library(
"LibcTestMain.cpp",
],
hdrs = [
+ "ErrnoCheckingTest.h",
"ErrnoSetterMatcher.h",
"ExecuteFunction.h",
"LibcTest.h",
@@ -80,19 +81,6 @@ libc_test_library(
alwayslink = True,
)
-libc_test_library(
- name = "errno_test_helpers",
- hdrs = [
- "ErrnoCheckingTest.h",
- ],
- deps = [
- ":LibcUnitTest",
- "//libc:__support_libc_errno",
- "//libc:__support_macros_config",
- "//libc:errno",
- ],
-)
-
libc_test_library(
name = "fp_test_helpers",
srcs = [
@@ -108,7 +96,6 @@ libc_test_library(
],
deps = [
":LibcUnitTest",
- ":errno_test_helpers",
":string_utils",
":test_logger",
"//libc:__support_cpp_array",
diff --git a/utils/bazel/llvm-project-overlay/libc/test/src/stdio/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/test/src/stdio/BUILD.bazel
index 505b73fd77111..484d3e5e0a24e 100644
--- a/utils/bazel/llvm-project-overlay/libc/test/src/stdio/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/libc/test/src/stdio/BUILD.bazel
@@ -122,7 +122,6 @@ libc_test(
"//libc:mkdirat",
"//libc:open",
"//libc:remove",
- "//libc/test/UnitTest:errno_test_helpers",
],
)
diff --git a/utils/bazel/llvm-project-overlay/libc/test/src/stdlib/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/test/src/stdlib/BUILD.bazel
index 4f66793d44dfe..ce92ca8caa6f4 100644
--- a/utils/bazel/llvm-project-overlay/libc/test/src/stdlib/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/libc/test/src/stdlib/BUILD.bazel
@@ -107,7 +107,6 @@ libc_test(
deps = [
"//libc:__support_fputil_fp_bits",
"//libc:atof",
- "//libc/test/UnitTest:errno_test_helpers",
],
)
@@ -208,7 +207,6 @@ libc_test_library(
"//libc:__support_macros_properties_architectures",
"//libc:errno",
"//libc/test/UnitTest:LibcUnitTest",
- "//libc/test/UnitTest:errno_test_helpers",
],
)
@@ -254,7 +252,6 @@ libc_test(
deps = [
"//libc:__support_fputil_fp_bits",
"//libc:strtof",
- "//libc/test/UnitTest:errno_test_helpers",
"//libc/test/UnitTest:fp_test_helpers",
],
)
@@ -265,7 +262,6 @@ libc_test(
deps = [
"//libc:__support_fputil_fp_bits",
"//libc:strtod",
- "//libc/test/UnitTest:errno_test_helpers",
"//libc/test/UnitTest:fp_test_helpers",
],
)
@@ -277,6 +273,5 @@ libc_test(
"//libc:__support_fputil_fp_bits",
"//libc:__support_uint128",
"//libc:strtold",
- "//libc/test/UnitTest:errno_test_helpers",
],
)
diff --git a/utils/bazel/llvm-project-overlay/libc/test/src/sys/epoll/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/test/src/sys/epoll/BUILD.bazel
index e391703075aa7..e0449d6a6a5bf 100644
--- a/utils/bazel/llvm-project-overlay/libc/test/src/sys/epoll/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/libc/test/src/sys/epoll/BUILD.bazel
@@ -16,7 +16,6 @@ libc_test(
deps = [
"//libc:close",
"//libc:epoll_create",
- "//libc/test/UnitTest:errno_test_helpers",
],
)
@@ -27,7 +26,6 @@ libc_test(
"//libc:close",
"//libc:epoll_create1",
"//libc:hdr_sys_epoll_macros",
- "//libc/test/UnitTest:errno_test_helpers",
],
)
@@ -41,7 +39,6 @@ libc_test(
"//libc:hdr_sys_epoll_macros",
"//libc:pipe",
"//libc:types_struct_epoll_event",
- "//libc/test/UnitTest:errno_test_helpers",
],
)
@@ -56,7 +53,6 @@ libc_test(
"//libc:hdr_sys_epoll_macros",
"//libc:pipe",
"//libc:types_struct_epoll_event",
- "//libc/test/UnitTest:errno_test_helpers",
],
)
@@ -71,7 +67,6 @@ libc_test(
"//libc:hdr_sys_epoll_macros",
"//libc:pipe",
"//libc:types_struct_epoll_event",
- "//libc/test/UnitTest:errno_test_helpers",
],
)
@@ -87,6 +82,5 @@ libc_test(
"//libc:pipe",
"//libc:types_struct_epoll_event",
"//libc:types_struct_timespec",
- "//libc/test/UnitTest:errno_test_helpers",
],
)
diff --git a/utils/bazel/llvm-project-overlay/libc/test/src/sys/socket/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/test/src/sys/socket/BUILD.bazel
index 743bf2a4743b7..c73fde124927d 100644
--- a/utils/bazel/llvm-project-overlay/libc/test/src/sys/socket/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/libc/test/src/sys/socket/BUILD.bazel
@@ -16,7 +16,6 @@ libc_test(
deps = [
"//libc:close",
"//libc:socket",
- "//libc/test/UnitTest:errno_test_helpers",
],
)
@@ -26,7 +25,6 @@ libc_test(
deps = [
"//libc:close",
"//libc:socketpair",
- "//libc/test/UnitTest:errno_test_helpers",
],
)
@@ -38,7 +36,6 @@ libc_test(
"//libc:recv",
"//libc:send",
"//libc:socketpair",
- "//libc/test/UnitTest:errno_test_helpers",
],
)
@@ -50,7 +47,6 @@ libc_test(
"//libc:recvfrom",
"//libc:sendto",
"//libc:socketpair",
- "//libc/test/UnitTest:errno_test_helpers",
],
)
@@ -62,6 +58,5 @@ libc_test(
"//libc:recvmsg",
"//libc:sendmsg",
"//libc:socketpair",
- "//libc/test/UnitTest:errno_test_helpers",
],
)
diff --git a/utils/bazel/llvm-project-overlay/libc/test/src/unistd/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/test/src/unistd/BUILD.bazel
index 661e0a6ff5dfe..ac74513c8c4af 100644
--- a/utils/bazel/llvm-project-overlay/libc/test/src/unistd/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/libc/test/src/unistd/BUILD.bazel
@@ -18,7 +18,6 @@ libc_test(
"//libc:close",
"//libc:open",
"//libc:unlink",
- "//libc/test/UnitTest:errno_test_helpers",
],
)
@@ -32,7 +31,6 @@ libc_test(
"//libc:read",
"//libc:unlink",
"//libc:write",
- "//libc/test/UnitTest:errno_test_helpers",
],
)
@@ -46,7 +44,6 @@ libc_test(
"//libc:read",
"//libc:unlink",
"//libc:write",
- "//libc/test/UnitTest:errno_test_helpers",
],
)
@@ -60,7 +57,6 @@ libc_test(
"//libc:read",
"//libc:unlink",
"//libc:write",
- "//libc/test/UnitTest:errno_test_helpers",
],
)
@@ -75,7 +71,6 @@ libc_test(
"//libc:read",
"//libc:unlink",
"//libc:write",
- "//libc/test/UnitTest:errno_test_helpers",
],
)
@@ -90,7 +85,6 @@ libc_test(
"//libc:pwrite",
"//libc:unlink",
"//libc:write",
- "//libc/test/UnitTest:errno_test_helpers",
],
)
@@ -104,7 +98,6 @@ libc_test(
"//libc:read",
"//libc:remove",
"//libc:write",
- "//libc/test/UnitTest:errno_test_helpers",
],
)
@@ -116,7 +109,6 @@ libc_test(
"//libc:link",
"//libc:open",
"//libc:unlink",
- "//libc/test/UnitTest:errno_test_helpers",
],
)
@@ -137,7 +129,6 @@ libc_test(
"//libc:open",
"//libc:symlink",
"//libc:unlink",
- "//libc/test/UnitTest:errno_test_helpers",
],
)
@@ -152,7 +143,6 @@ libc_test(
"//libc:truncate",
"//libc:unlink",
"//libc:write",
- "//libc/test/UnitTest:errno_test_helpers",
],
)
@@ -163,7 +153,6 @@ libc_test(
"//libc:close",
"//libc:open",
"//libc:unlink",
- "//libc/test/UnitTest:errno_test_helpers",
],
)
@@ -190,7 +179,6 @@ libc_test(
"//libc:close",
"//libc:isatty",
"//libc:open",
- "//libc/test/UnitTest:errno_test_helpers",
],
)
|
lntue
approved these changes
Sep 15, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
LibcUnitTest helper library already contains some logic for errno validation (ErrnoSetterMatcher.h), and since errno validation is used so extensively in various unit tests, it makes sense to fold ErrnoCheckingTest.h (which would be required for errno validation soon) there as well for simplicity.