[libc-commits] [libc] 3af87d4 - [libc] Remove asm-generic includes from tests (#114479)

[via libc-commits]

Author: Michael Jones
Date: 2024-10-31T15:56:58-07:00
New Revision: 3af87d4c5709fb7498e5adf75ec07e6528b14e1a

URL: https://github.com/llvm/llvm-project/commit/3af87d4c5709fb7498e5adf75ec07e6528b14e1a
DIFF: https://github.com/llvm/llvm-project/commit/3af87d4c5709fb7498e5adf75ec07e6528b14e1a.diff

LOG: [libc] Remove asm-generic includes from tests (#114479)

We shouldn't be including headers directly from asm-generic for macros.
It's safer to get those through the correct primary header where
possible (e.g. fcntl instead of asm-generic/fcntl).

For our public headers we may need to include the asm-generic
headers instead of defining all the macros ourselves, but that's
something for a followup PR.

Added: 
    

Modified: 
    libc/test/src/search/hsearch_test.cpp
    libc/test/src/sys/mman/linux/mlock_test.cpp

Removed: 
    


################################################################################
diff  --git a/libc/test/src/search/hsearch_test.cpp b/libc/test/src/search/hsearch_test.cpp
index f7d94791f2bc03..01805d8f5b4da9 100644
--- a/libc/test/src/search/hsearch_test.cpp
+++ b/libc/test/src/search/hsearch_test.cpp
@@ -15,7 +15,6 @@
 #include "src/search/hsearch.h"
 #include "test/UnitTest/ErrnoSetterMatcher.h"
 #include "test/UnitTest/Test.h"
-#include <asm-generic/errno-base.h>
 
 TEST(LlvmLibcHsearchTest, CreateTooLarge) {
   using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Fails;

diff  --git a/libc/test/src/sys/mman/linux/mlock_test.cpp b/libc/test/src/sys/mman/linux/mlock_test.cpp
index 804038a68a7e09..c6e459276a8fbf 100644
--- a/libc/test/src/sys/mman/linux/mlock_test.cpp
+++ b/libc/test/src/sys/mman/linux/mlock_test.cpp
@@ -23,8 +23,6 @@
 #include "test/UnitTest/LibcTest.h"
 #include "test/UnitTest/Test.h"
 
-#include <asm-generic/errno-base.h>
-#include <asm-generic/mman.h>
 #include <linux/capability.h>
 #include <sys/mman.h>
 #include <sys/resource.h>