From 7abf6c2524d0ea0363b5d34803d921db73b6c505 Mon Sep 17 00:00:00 2001 From: Siva Chandra Reddy Date: Fri, 3 Mar 2023 21:24:09 +0000 Subject: [PATCH] [libc] Switch signal and termios to libc_errno. Reviewed By: michaelrj Differential Revision: https://reviews.llvm.org/D145274 --- libc/src/signal/linux/CMakeLists.txt | 5 ----- libc/src/signal/linux/kill.cpp | 7 +++---- libc/src/signal/linux/sigaction.cpp | 4 ++-- libc/src/signal/linux/sigaddset.cpp | 4 ++-- libc/src/signal/linux/sigaltstack.cpp | 8 ++++---- libc/src/signal/linux/sigdelset.cpp | 4 ++-- libc/src/signal/linux/sigemptyset.cpp | 4 ++-- libc/src/signal/linux/sigfillset.cpp | 4 ++-- libc/src/signal/linux/sigprocmask.cpp | 4 ++-- libc/src/termios/linux/cfsetispeed.cpp | 4 ++-- libc/src/termios/linux/cfsetospeed.cpp | 4 ++-- libc/src/termios/linux/tcdrain.cpp | 2 +- libc/src/termios/linux/tcflow.cpp | 4 ++-- libc/src/termios/linux/tcflush.cpp | 2 +- libc/src/termios/linux/tcgetattr.cpp | 4 ++-- libc/src/termios/linux/tcgetsid.cpp | 2 +- libc/src/termios/linux/tcsendbreak.cpp | 4 ++-- libc/src/termios/linux/tcsetattr.cpp | 6 +++--- libc/test/src/signal/CMakeLists.txt | 7 ++----- libc/test/src/signal/kill_test.cpp | 1 - libc/test/src/signal/sigaddset_test.cpp | 3 ++- libc/test/src/signal/sigaltstack_test.cpp | 4 ++-- libc/test/src/signal/sigdelset_test.cpp | 3 ++- libc/test/src/signal/sigfillset_test.cpp | 3 ++- libc/test/src/signal/signal_test.cpp | 5 ++--- libc/test/src/signal/sigprocmask_test.cpp | 5 ++--- libc/test/src/termios/CMakeLists.txt | 2 +- libc/test/src/termios/termios_test.cpp | 16 ++++++++-------- 28 files changed, 58 insertions(+), 67 deletions(-) diff --git a/libc/src/signal/linux/CMakeLists.txt b/libc/src/signal/linux/CMakeLists.txt index 46297c2310375..d0cb0a79312b8 100644 --- a/libc/src/signal/linux/CMakeLists.txt +++ b/libc/src/signal/linux/CMakeLists.txt @@ -15,7 +15,6 @@ add_entrypoint_object( ../kill.h DEPENDS libc.include.signal - libc.include.errno libc.src.errno.errno libc.include.sys_syscall libc.src.__support.OSUtil.osutil @@ -100,7 +99,6 @@ add_entrypoint_object( ../sigemptyset.h DEPENDS .signal_utils - libc.include.errno libc.include.signal libc.src.errno.errno ) @@ -113,7 +111,6 @@ add_entrypoint_object( ../sigaddset.h DEPENDS .signal_utils - libc.include.errno libc.include.signal libc.src.errno.errno ) @@ -137,7 +134,6 @@ add_entrypoint_object( ../sigfillset.h DEPENDS .signal_utils - libc.include.errno libc.include.signal libc.src.errno.errno ) @@ -150,7 +146,6 @@ add_entrypoint_object( ../sigdelset.h DEPENDS .signal_utils - libc.include.errno libc.include.signal libc.src.errno.errno ) diff --git a/libc/src/signal/linux/kill.cpp b/libc/src/signal/linux/kill.cpp index ef957569f6d39..877267f3b08cf 100644 --- a/libc/src/signal/linux/kill.cpp +++ b/libc/src/signal/linux/kill.cpp @@ -9,11 +9,10 @@ #include "src/signal/kill.h" #include "src/__support/OSUtil/syscall.h" // For internal syscall function. -#include "src/signal/linux/signal_utils.h" - #include "src/__support/common.h" +#include "src/errno/libc_errno.h" +#include "src/signal/linux/signal_utils.h" -#include #include #include // For syscall numbers. @@ -25,7 +24,7 @@ LLVM_LIBC_FUNCTION(int, kill, (pid_t pid, int sig)) { // A negative return value indicates an error with the magnitude of the // value being the error code. if (ret != 0) { - errno = (ret > 0 ? ret : -ret); + libc_errno = (ret > 0 ? ret : -ret); return -1; } diff --git a/libc/src/signal/linux/sigaction.cpp b/libc/src/signal/linux/sigaction.cpp index a229e142fd157..b3f057ebb5adc 100644 --- a/libc/src/signal/linux/sigaction.cpp +++ b/libc/src/signal/linux/sigaction.cpp @@ -7,11 +7,11 @@ //===----------------------------------------------------------------------===// #include "src/signal/sigaction.h" +#include "src/errno/libc_errno.h" #include "src/signal/linux/signal_utils.h" #include "src/__support/common.h" -#include #include namespace __llvm_libc { @@ -38,7 +38,7 @@ LLVM_LIBC_FUNCTION(int, sigaction, SYS_rt_sigaction, signal, libc_new ? &kernel_new : nullptr, libc_old ? &kernel_old : nullptr, sizeof(sigset_t)); if (ret) { - errno = -ret; + libc_errno = -ret; return -1; } diff --git a/libc/src/signal/linux/sigaddset.cpp b/libc/src/signal/linux/sigaddset.cpp index ea79445640e84..ff65c04e3e952 100644 --- a/libc/src/signal/linux/sigaddset.cpp +++ b/libc/src/signal/linux/sigaddset.cpp @@ -8,9 +8,9 @@ #include "src/signal/sigaddset.h" #include "src/__support/common.h" +#include "src/errno/libc_errno.h" #include "src/signal/linux/signal_utils.h" -#include #include namespace __llvm_libc { @@ -18,7 +18,7 @@ namespace __llvm_libc { LLVM_LIBC_FUNCTION(int, sigaddset, (sigset_t * set, int signum)) { if (set != nullptr && add_signal(*set, signum)) return 0; - errno = EINVAL; + libc_errno = EINVAL; return -1; } diff --git a/libc/src/signal/linux/sigaltstack.cpp b/libc/src/signal/linux/sigaltstack.cpp index 7af9106c7ecc8..359a643f847bd 100644 --- a/libc/src/signal/linux/sigaltstack.cpp +++ b/libc/src/signal/linux/sigaltstack.cpp @@ -7,11 +7,11 @@ //===----------------------------------------------------------------------===// #include "src/signal/sigaltstack.h" +#include "src/errno/libc_errno.h" #include "src/signal/linux/signal_utils.h" #include "src/__support/common.h" -#include #include #include @@ -25,18 +25,18 @@ LLVM_LIBC_FUNCTION(int, sigaltstack, // Flags cannot have anything other than SS_DISABLE set. // We do the type-casting to unsigned because the |ss_flags| // field of stack_t is of type "int". - errno = EINVAL; + libc_errno = EINVAL; return -1; } if (ss->ss_size < MINSIGSTKSZ) { - errno = ENOMEM; + libc_errno = ENOMEM; return -1; } } int ret = __llvm_libc::syscall_impl(SYS_sigaltstack, ss, oss); if (ret < 0) { - errno = -ret; + libc_errno = -ret; return -1; } return 0; diff --git a/libc/src/signal/linux/sigdelset.cpp b/libc/src/signal/linux/sigdelset.cpp index 2eec258754716..ebaa4122c067e 100644 --- a/libc/src/signal/linux/sigdelset.cpp +++ b/libc/src/signal/linux/sigdelset.cpp @@ -8,9 +8,9 @@ #include "src/signal/sigdelset.h" #include "src/__support/common.h" +#include "src/errno/libc_errno.h" #include "src/signal/linux/signal_utils.h" -#include #include namespace __llvm_libc { @@ -18,7 +18,7 @@ namespace __llvm_libc { LLVM_LIBC_FUNCTION(int, sigdelset, (sigset_t * set, int signum)) { if (set != nullptr && delete_signal(*set, signum)) return 0; - errno = EINVAL; + libc_errno = EINVAL; return -1; } diff --git a/libc/src/signal/linux/sigemptyset.cpp b/libc/src/signal/linux/sigemptyset.cpp index 311fcb4bc8e95..6f4c731b0831a 100644 --- a/libc/src/signal/linux/sigemptyset.cpp +++ b/libc/src/signal/linux/sigemptyset.cpp @@ -7,18 +7,18 @@ //===----------------------------------------------------------------------===// #include "src/signal/sigemptyset.h" +#include "src/errno/libc_errno.h" #include "src/signal/linux/signal_utils.h" #include "src/__support/common.h" -#include #include namespace __llvm_libc { LLVM_LIBC_FUNCTION(int, sigemptyset, (sigset_t * set)) { if (!set) { - errno = EINVAL; + libc_errno = EINVAL; return -1; } *set = empty_set(); diff --git a/libc/src/signal/linux/sigfillset.cpp b/libc/src/signal/linux/sigfillset.cpp index 2fb09ede026db..9c3796dbee47f 100644 --- a/libc/src/signal/linux/sigfillset.cpp +++ b/libc/src/signal/linux/sigfillset.cpp @@ -8,16 +8,16 @@ #include "src/signal/sigfillset.h" #include "src/__support/common.h" +#include "src/errno/libc_errno.h" #include "src/signal/linux/signal_utils.h" -#include #include namespace __llvm_libc { LLVM_LIBC_FUNCTION(int, sigfillset, (sigset_t * set)) { if (!set) { - errno = EINVAL; + libc_errno = EINVAL; return -1; } *set = full_set(); diff --git a/libc/src/signal/linux/sigprocmask.cpp b/libc/src/signal/linux/sigprocmask.cpp index cd205815eff57..c128197e736b3 100644 --- a/libc/src/signal/linux/sigprocmask.cpp +++ b/libc/src/signal/linux/sigprocmask.cpp @@ -9,11 +9,11 @@ #include "src/signal/sigprocmask.h" #include "include/sys/syscall.h" // For syscall numbers. #include "src/__support/OSUtil/syscall.h" // For internal syscall function. +#include "src/errno/libc_errno.h" #include "src/signal/linux/signal_utils.h" #include "src/__support/common.h" -#include #include namespace __llvm_libc { @@ -26,7 +26,7 @@ LLVM_LIBC_FUNCTION(int, sigprocmask, if (!ret) return 0; - errno = -ret; + libc_errno = -ret; return -1; } diff --git a/libc/src/termios/linux/cfsetispeed.cpp b/libc/src/termios/linux/cfsetispeed.cpp index b753892508cfc..7beb1171b8ee4 100644 --- a/libc/src/termios/linux/cfsetispeed.cpp +++ b/libc/src/termios/linux/cfsetispeed.cpp @@ -9,8 +9,8 @@ #include "src/termios/cfsetispeed.h" #include "src/__support/common.h" +#include "src/errno/libc_errno.h" -#include #include namespace __llvm_libc { @@ -19,7 +19,7 @@ LLVM_LIBC_FUNCTION(int, cfsetispeed, (struct termios * t, speed_t speed)) { constexpr speed_t NOT_SPEED_MASK = ~speed_t(CBAUD); // A speed value is valid only if it is equal to one of the B values. if (t == nullptr || ((speed & NOT_SPEED_MASK) != 0)) { - errno = EINVAL; + libc_errno = EINVAL; return -1; } diff --git a/libc/src/termios/linux/cfsetospeed.cpp b/libc/src/termios/linux/cfsetospeed.cpp index e51f85d221116..327cc56428f3c 100644 --- a/libc/src/termios/linux/cfsetospeed.cpp +++ b/libc/src/termios/linux/cfsetospeed.cpp @@ -7,10 +7,10 @@ //===----------------------------------------------------------------------===// #include "src/termios/cfsetospeed.h" +#include "src/errno/libc_errno.h" #include "src/__support/common.h" -#include #include namespace __llvm_libc { @@ -19,7 +19,7 @@ LLVM_LIBC_FUNCTION(int, cfsetospeed, (struct termios * t, speed_t speed)) { constexpr speed_t NOT_SPEED_MASK = ~speed_t(CBAUD); // A speed value is valid only if it is equal to one of the B values. if (t == nullptr || ((speed & NOT_SPEED_MASK) != 0)) { - errno = EINVAL; + libc_errno = EINVAL; return -1; } diff --git a/libc/src/termios/linux/tcdrain.cpp b/libc/src/termios/linux/tcdrain.cpp index c59a09b40cde8..910e62bfda9ec 100644 --- a/libc/src/termios/linux/tcdrain.cpp +++ b/libc/src/termios/linux/tcdrain.cpp @@ -10,9 +10,9 @@ #include "src/__support/OSUtil/syscall.h" #include "src/__support/common.h" +#include "src/errno/libc_errno.h" #include // Safe to include without the risk of name pollution. -#include #include // For syscall numbers #include diff --git a/libc/src/termios/linux/tcflow.cpp b/libc/src/termios/linux/tcflow.cpp index 0344f7b527f84..b28cad0bb2380 100644 --- a/libc/src/termios/linux/tcflow.cpp +++ b/libc/src/termios/linux/tcflow.cpp @@ -10,9 +10,9 @@ #include "src/__support/OSUtil/syscall.h" #include "src/__support/common.h" +#include "src/errno/libc_errno.h" #include // Safe to include without the risk of name pollution. -#include #include // For syscall numbers #include @@ -21,7 +21,7 @@ namespace __llvm_libc { LLVM_LIBC_FUNCTION(int, tcflow, (int fd, int action)) { long ret = __llvm_libc::syscall_impl(SYS_ioctl, fd, TCXONC, action); if (ret < 0) { - errno = -ret; + libc_errno = -ret; return -1; } return 0; diff --git a/libc/src/termios/linux/tcflush.cpp b/libc/src/termios/linux/tcflush.cpp index e916484044511..fd876afa17d79 100644 --- a/libc/src/termios/linux/tcflush.cpp +++ b/libc/src/termios/linux/tcflush.cpp @@ -10,9 +10,9 @@ #include "src/__support/OSUtil/syscall.h" #include "src/__support/common.h" +#include "src/errno/libc_errno.h" #include // Safe to include without the risk of name pollution. -#include #include // For syscall numbers #include diff --git a/libc/src/termios/linux/tcgetattr.cpp b/libc/src/termios/linux/tcgetattr.cpp index 9b3a88901b3e0..20c9d5df10b62 100644 --- a/libc/src/termios/linux/tcgetattr.cpp +++ b/libc/src/termios/linux/tcgetattr.cpp @@ -11,9 +11,9 @@ #include "src/__support/OSUtil/syscall.h" #include "src/__support/common.h" +#include "src/errno/libc_errno.h" #include // Safe to include without the risk of name pollution. -#include #include // For syscall numbers #include @@ -23,7 +23,7 @@ LLVM_LIBC_FUNCTION(int, tcgetattr, (int fd, struct termios *t)) { __llvm_libc::kernel_termios kt; long ret = __llvm_libc::syscall_impl(SYS_ioctl, fd, TCGETS, &kt); if (ret < 0) { - errno = -ret; + libc_errno = -ret; return -1; } t->c_iflag = kt.c_iflag; diff --git a/libc/src/termios/linux/tcgetsid.cpp b/libc/src/termios/linux/tcgetsid.cpp index 8f0923431a428..b366fd4e9b711 100644 --- a/libc/src/termios/linux/tcgetsid.cpp +++ b/libc/src/termios/linux/tcgetsid.cpp @@ -10,9 +10,9 @@ #include "src/__support/OSUtil/syscall.h" #include "src/__support/common.h" +#include "src/errno/libc_errno.h" #include // Safe to include without the risk of name pollution. -#include #include // For syscall numbers #include diff --git a/libc/src/termios/linux/tcsendbreak.cpp b/libc/src/termios/linux/tcsendbreak.cpp index 18aeba6b80988..d15510da77d46 100644 --- a/libc/src/termios/linux/tcsendbreak.cpp +++ b/libc/src/termios/linux/tcsendbreak.cpp @@ -10,9 +10,9 @@ #include "src/__support/OSUtil/syscall.h" #include "src/__support/common.h" +#include "src/errno/libc_errno.h" #include // Safe to include without the risk of name pollution. -#include #include // For syscall numbers #include @@ -24,7 +24,7 @@ LLVM_LIBC_FUNCTION(pid_t, tcsendbreak, (int fd, int /* unused duration */)) { // zero. So, we just pass zero to the syscall. long ret = __llvm_libc::syscall_impl(SYS_ioctl, fd, TCSBRK, 0); if (ret < 0) { - errno = -ret; + libc_errno = -ret; return -1; } return 0; diff --git a/libc/src/termios/linux/tcsetattr.cpp b/libc/src/termios/linux/tcsetattr.cpp index edcae88aa7731..eb35581f6c641 100644 --- a/libc/src/termios/linux/tcsetattr.cpp +++ b/libc/src/termios/linux/tcsetattr.cpp @@ -11,9 +11,9 @@ #include "src/__support/OSUtil/syscall.h" #include "src/__support/common.h" +#include "src/errno/libc_errno.h" #include // Safe to include without the risk of name pollution. -#include #include // For syscall numbers #include @@ -35,7 +35,7 @@ LLVM_LIBC_FUNCTION(int, tcsetattr, cmd = TCSETSF; break; default: - errno = EINVAL; + libc_errno = EINVAL; return -1; } @@ -53,7 +53,7 @@ LLVM_LIBC_FUNCTION(int, tcsetattr, long ret = __llvm_libc::syscall_impl(SYS_ioctl, fd, cmd, &kt); if (ret < 0) { - errno = -ret; + libc_errno = -ret; return -1; } return 0; diff --git a/libc/test/src/signal/CMakeLists.txt b/libc/test/src/signal/CMakeLists.txt index 030a15437c40d..fe49328668032 100644 --- a/libc/test/src/signal/CMakeLists.txt +++ b/libc/test/src/signal/CMakeLists.txt @@ -19,8 +19,6 @@ add_libc_unittest( kill_test.cpp DEPENDS libc.include.signal - libc.include.errno - libc.src.errno.errno libc.src.signal.kill libc.include.sys_syscall libc.src.__support.OSUtil.osutil @@ -48,7 +46,6 @@ add_libc_unittest( SRCS sigprocmask_test.cpp DEPENDS - libc.include.errno libc.src.errno.errno libc.src.signal.raise libc.src.signal.sigaddset @@ -77,7 +74,6 @@ add_libc_unittest( SRCS signal_test.cpp DEPENDS - libc.include.errno libc.include.signal libc.src.errno.errno libc.src.signal.raise @@ -123,9 +119,10 @@ add_libc_unittest( SRCS sigaltstack_test.cpp DEPENDS - libc.include.errno libc.include.signal + libc.src.errno.errno libc.src.signal.raise libc.src.signal.sigaltstack libc.src.signal.sigaction + libc.test.errno_setter_matcher ) diff --git a/libc/test/src/signal/kill_test.cpp b/libc/test/src/signal/kill_test.cpp index 7464f2c716dc2..9d04b3aa0d37b 100644 --- a/libc/test/src/signal/kill_test.cpp +++ b/libc/test/src/signal/kill_test.cpp @@ -13,7 +13,6 @@ #include "test/ErrnoSetterMatcher.h" #include "test/UnitTest/Test.h" -#include #include using __llvm_libc::testing::ErrnoSetterMatcher::Succeeds; diff --git a/libc/test/src/signal/sigaddset_test.cpp b/libc/test/src/signal/sigaddset_test.cpp index a9cc5141cb8f2..9ff331084589d 100644 --- a/libc/test/src/signal/sigaddset_test.cpp +++ b/libc/test/src/signal/sigaddset_test.cpp @@ -6,13 +6,14 @@ // //===----------------------------------------------------------------------===// -#include "include/errno.h" #include "include/signal.h" #include "src/signal/sigaddset.h" #include "test/ErrnoSetterMatcher.h" #include "test/UnitTest/Test.h" +#include + // This tests invalid inputs and ensures errno is properly set. TEST(LlvmLibcSignalTest, SigaddsetInvalid) { using __llvm_libc::testing::ErrnoSetterMatcher::Fails; diff --git a/libc/test/src/signal/sigaltstack_test.cpp b/libc/test/src/signal/sigaltstack_test.cpp index 15f2089ee913c..7c92279eaa426 100644 --- a/libc/test/src/signal/sigaltstack_test.cpp +++ b/libc/test/src/signal/sigaltstack_test.cpp @@ -7,6 +7,7 @@ //===----------------------------------------------------------------------===// #include "src/__support/OSUtil/syscall.h" // For internal syscall function. +#include "src/errno/libc_errno.h" #include "src/signal/linux/signal_utils.h" #include "src/signal/raise.h" #include "src/signal/sigaction.h" @@ -15,7 +16,6 @@ #include "test/ErrnoSetterMatcher.h" #include "test/UnitTest/Test.h" -#include #include #include #include @@ -47,7 +47,7 @@ static void handler(int) { TEST(LlvmLibcSignalTest, SigaltstackRunOnAltStack) { struct sigaction action; - errno = 0; + libc_errno = 0; ASSERT_THAT(__llvm_libc::sigaction(SIGUSR1, nullptr, &action), Succeeds(0)); action.sa_handler = handler; // Indicate that the signal should be delivered on an alternate stack. diff --git a/libc/test/src/signal/sigdelset_test.cpp b/libc/test/src/signal/sigdelset_test.cpp index 334344e314c39..8cb477f33823e 100644 --- a/libc/test/src/signal/sigdelset_test.cpp +++ b/libc/test/src/signal/sigdelset_test.cpp @@ -6,7 +6,6 @@ // //===----------------------------------------------------------------------===// -#include "include/errno.h" #include "include/signal.h" #include "src/signal/raise.h" #include "src/signal/sigdelset.h" @@ -16,6 +15,8 @@ #include "test/ErrnoSetterMatcher.h" #include "test/UnitTest/Test.h" +#include + TEST(LlvmLibcSigdelset, Invalid) { using __llvm_libc::testing::ErrnoSetterMatcher::Fails; // Invalid set. diff --git a/libc/test/src/signal/sigfillset_test.cpp b/libc/test/src/signal/sigfillset_test.cpp index 683bfed1113cb..9afc0025335f8 100644 --- a/libc/test/src/signal/sigfillset_test.cpp +++ b/libc/test/src/signal/sigfillset_test.cpp @@ -6,7 +6,6 @@ // //===----------------------------------------------------------------------===// -#include "include/errno.h" #include "include/signal.h" #include "src/signal/raise.h" #include "src/signal/sigfillset.h" @@ -15,6 +14,8 @@ #include "test/ErrnoSetterMatcher.h" #include "test/UnitTest/Test.h" +#include + TEST(LlvmLibcSigfillset, Invalid) { using __llvm_libc::testing::ErrnoSetterMatcher::Fails; EXPECT_THAT(__llvm_libc::sigfillset(nullptr), Fails(EINVAL)); diff --git a/libc/test/src/signal/signal_test.cpp b/libc/test/src/signal/signal_test.cpp index 9946891e51667..fdf0934dbe7ec 100644 --- a/libc/test/src/signal/signal_test.cpp +++ b/libc/test/src/signal/signal_test.cpp @@ -6,9 +6,8 @@ // //===----------------------------------------------------------------------===// -#include "include/errno.h" #include "include/signal.h" -#include "src/errno/llvmlibc_errno.h" +#include "src/errno/libc_errno.h" #include "src/signal/raise.h" #include "src/signal/signal.h" @@ -19,7 +18,7 @@ using __llvm_libc::testing::ErrnoSetterMatcher::Fails; using __llvm_libc::testing::ErrnoSetterMatcher::Succeeds; TEST(LlvmLibcSignal, Invalid) { - llvmlibc_errno = 0; + libc_errno = 0; __llvm_libc::sighandler_t valid = +[](int) {}; EXPECT_THAT((void *)__llvm_libc::signal(0, valid), Fails(EINVAL, (void *)SIG_ERR)); diff --git a/libc/test/src/signal/sigprocmask_test.cpp b/libc/test/src/signal/sigprocmask_test.cpp index e0ce054bdde8c..a36364e0cd5fe 100644 --- a/libc/test/src/signal/sigprocmask_test.cpp +++ b/libc/test/src/signal/sigprocmask_test.cpp @@ -6,9 +6,8 @@ // //===----------------------------------------------------------------------===// -#include "include/errno.h" #include "include/signal.h" -#include "src/errno/llvmlibc_errno.h" +#include "src/errno/libc_errno.h" #include "src/signal/raise.h" #include "src/signal/sigaddset.h" #include "src/signal/sigemptyset.h" @@ -33,7 +32,7 @@ using __llvm_libc::testing::ErrnoSetterMatcher::Succeeds; // This tests for invalid input. TEST_F(LlvmLibcSignalTest, SigprocmaskInvalid) { - llvmlibc_errno = 0; + libc_errno = 0; sigset_t valid; // 17 and -4 are out of the range for sigprocmask's how paramater. diff --git a/libc/test/src/termios/CMakeLists.txt b/libc/test/src/termios/CMakeLists.txt index ce11de440cafa..991d8d613539d 100644 --- a/libc/test/src/termios/CMakeLists.txt +++ b/libc/test/src/termios/CMakeLists.txt @@ -7,8 +7,8 @@ add_libc_unittest( SRCS termios_test.cpp DEPENDS - libc.include.errno libc.include.termios + libc.src.errno.errno libc.src.fcntl.open libc.src.termios.cfgetispeed libc.src.termios.cfgetospeed diff --git a/libc/test/src/termios/termios_test.cpp b/libc/test/src/termios/termios_test.cpp index 2e6b12f938b0d..7c2d219abb91e 100644 --- a/libc/test/src/termios/termios_test.cpp +++ b/libc/test/src/termios/termios_test.cpp @@ -6,6 +6,7 @@ // //===----------------------------------------------------------------------===// +#include "src/errno/libc_errno.h" #include "src/fcntl/open.h" #include "src/termios/cfgetispeed.h" #include "src/termios/cfgetospeed.h" @@ -18,7 +19,6 @@ #include "test/ErrnoSetterMatcher.h" #include "test/UnitTest/Test.h" -#include #include using __llvm_libc::testing::ErrnoSetterMatcher::Fails; @@ -30,35 +30,35 @@ using __llvm_libc::testing::ErrnoSetterMatcher::Succeeds; TEST(LlvmLibcTermiosTest, SpeedSmokeTest) { struct termios t; - errno = 0; + libc_errno = 0; ASSERT_THAT(__llvm_libc::cfsetispeed(&t, B50), Succeeds(0)); ASSERT_EQ(__llvm_libc::cfgetispeed(&t), speed_t(B50)); ASSERT_THAT(__llvm_libc::cfsetospeed(&t, B75), Succeeds(0)); ASSERT_EQ(__llvm_libc::cfgetospeed(&t), speed_t(B75)); - errno = 0; + libc_errno = 0; ASSERT_THAT(__llvm_libc::cfsetispeed(&t, ~CBAUD), Fails(EINVAL)); - errno = 0; + libc_errno = 0; ASSERT_THAT(__llvm_libc::cfsetospeed(&t, ~CBAUD), Fails(EINVAL)); } TEST(LlvmLibcTermiosTest, GetAttrSmokeTest) { struct termios t; - errno = 0; + libc_errno = 0; int fd = __llvm_libc::open("/dev/tty", O_RDONLY); if (fd < 0) return; // When /dev/tty is not available, no point continuing. - ASSERT_EQ(errno, 0); + ASSERT_EQ(libc_errno, 0); ASSERT_THAT(__llvm_libc::tcgetattr(fd, &t), Succeeds(0)); ASSERT_EQ(__llvm_libc::close(fd), 0); } TEST(LlvmLibcTermiosTest, TcGetSidSmokeTest) { - errno = 0; + libc_errno = 0; int fd = __llvm_libc::open("/dev/tty", O_RDONLY); if (fd < 0) return; // When /dev/tty is not available, no point continuing. - ASSERT_EQ(errno, 0); + ASSERT_EQ(libc_errno, 0); ASSERT_GT(__llvm_libc::tcgetsid(fd), pid_t(0)); ASSERT_EQ(__llvm_libc::close(fd), 0); }