diff options
Diffstat (limited to 'libc/test')
158 files changed, 1664 insertions, 237 deletions
diff --git a/libc/test/IntegrationTest/CMakeLists.txt b/libc/test/IntegrationTest/CMakeLists.txt index 4a99940..3afe354 100644 --- a/libc/test/IntegrationTest/CMakeLists.txt +++ b/libc/test/IntegrationTest/CMakeLists.txt @@ -11,6 +11,7 @@ add_object_library( HDRS test.h DEPENDS + libc.hdr.stdint_proxy libc.src.__support.OSUtil.osutil ${arch_specific_deps} ) diff --git a/libc/test/IntegrationTest/test.cpp b/libc/test/IntegrationTest/test.cpp index 871bdf0..8baf746 100644 --- a/libc/test/IntegrationTest/test.cpp +++ b/libc/test/IntegrationTest/test.cpp @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// +#include "hdr/stdint_proxy.h" #include "src/__support/common.h" #include "src/__support/macros/config.h" #include <stddef.h> -#include <stdint.h> #ifdef LIBC_TARGET_ARCH_IS_AARCH64 #include "src/sys/auxv/getauxval.h" diff --git a/libc/test/UnitTest/CMakeLists.txt b/libc/test/UnitTest/CMakeLists.txt index c32809d..d92ab6f 100644 --- a/libc/test/UnitTest/CMakeLists.txt +++ b/libc/test/UnitTest/CMakeLists.txt @@ -69,6 +69,7 @@ add_unittest_framework_library( Test.h TestLogger.h DEPENDS + libc.hdr.stdint_proxy libc.src.__support.big_int libc.src.__support.c_string libc.src.__support.CPP.string @@ -91,12 +92,16 @@ add_unittest_framework_library( ${libc_death_test_srcs} HDRS ExecuteFunction.h + DEPENDS + libc.hdr.stdint_proxy ) add_unittest_framework_library( LibcHermeticTestSupport SRCS HermeticTestUtils.cpp + DEPENDS + libc.hdr.stdint_proxy ) add_header_library( @@ -160,6 +165,7 @@ add_unittest_framework_library( PrintfMatcher.h DEPENDS LibcTest + libc.hdr.stdint_proxy libc.src.__support.FPUtil.fp_bits libc.src.stdio.printf_core.core_structs libc.test.UnitTest.string_utils @@ -173,6 +179,7 @@ add_unittest_framework_library( ScanfMatcher.h DEPENDS LibcTest + libc.hdr.stdint_proxy libc.src.__support.FPUtil.fp_bits libc.src.stdio.scanf_core.core_structs libc.test.UnitTest.string_utils diff --git a/libc/test/UnitTest/ExecuteFunction.h b/libc/test/UnitTest/ExecuteFunction.h index 93ab6e9..5844fd5 100644 --- a/libc/test/UnitTest/ExecuteFunction.h +++ b/libc/test/UnitTest/ExecuteFunction.h @@ -9,9 +9,9 @@ #ifndef LLVM_LIBC_TEST_UNITTEST_EXECUTEFUNCTION_H #define LLVM_LIBC_TEST_UNITTEST_EXECUTEFUNCTION_H +#include "hdr/stdint_proxy.h" #include "src/__support/CPP/limits.h" #include "src/__support/macros/config.h" -#include <stdint.h> namespace LIBC_NAMESPACE_DECL { namespace testutils { diff --git a/libc/test/UnitTest/HermeticTestUtils.cpp b/libc/test/UnitTest/HermeticTestUtils.cpp index a9494af..f34a73f 100644 --- a/libc/test/UnitTest/HermeticTestUtils.cpp +++ b/libc/test/UnitTest/HermeticTestUtils.cpp @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// +#include "hdr/stdint_proxy.h" #include "src/__support/common.h" #include "src/__support/macros/config.h" #include <stddef.h> -#include <stdint.h> #ifdef LIBC_TARGET_ARCH_IS_AARCH64 #include "src/sys/auxv/getauxval.h" diff --git a/libc/test/UnitTest/PrintfMatcher.cpp b/libc/test/UnitTest/PrintfMatcher.cpp index 4fdcbf1..2ea1bbf 100644 --- a/libc/test/UnitTest/PrintfMatcher.cpp +++ b/libc/test/UnitTest/PrintfMatcher.cpp @@ -8,6 +8,7 @@ #include "PrintfMatcher.h" +#include "hdr/stdint_proxy.h" #include "src/__support/FPUtil/FPBits.h" #include "src/__support/macros/config.h" #include "src/stdio/printf_core/core_structs.h" @@ -15,8 +16,6 @@ #include "test/UnitTest/StringUtils.h" #include "test/UnitTest/Test.h" -#include <stdint.h> - namespace LIBC_NAMESPACE_DECL { namespace testing { diff --git a/libc/test/UnitTest/RoundingModeUtils.h b/libc/test/UnitTest/RoundingModeUtils.h index cdc3699..5f23a87 100644 --- a/libc/test/UnitTest/RoundingModeUtils.h +++ b/libc/test/UnitTest/RoundingModeUtils.h @@ -9,8 +9,8 @@ #ifndef LLVM_LIBC_TEST_UNITTEST_ROUNDINGMODEUTILS_H #define LLVM_LIBC_TEST_UNITTEST_ROUNDINGMODEUTILS_H +#include "hdr/stdint_proxy.h" #include "src/__support/macros/config.h" -#include <stdint.h> namespace LIBC_NAMESPACE_DECL { namespace fputil { diff --git a/libc/test/UnitTest/ScanfMatcher.cpp b/libc/test/UnitTest/ScanfMatcher.cpp index 3e9f2a5..d47ad71 100644 --- a/libc/test/UnitTest/ScanfMatcher.cpp +++ b/libc/test/UnitTest/ScanfMatcher.cpp @@ -8,6 +8,7 @@ #include "ScanfMatcher.h" +#include "hdr/stdint_proxy.h" #include "src/__support/FPUtil/FPBits.h" #include "src/__support/macros/config.h" #include "src/stdio/scanf_core/core_structs.h" @@ -15,8 +16,6 @@ #include "test/UnitTest/StringUtils.h" #include "test/UnitTest/Test.h" -#include <stdint.h> - namespace LIBC_NAMESPACE_DECL { namespace testing { diff --git a/libc/test/UnitTest/TestLogger.cpp b/libc/test/UnitTest/TestLogger.cpp index e1df798..3d95d48 100644 --- a/libc/test/UnitTest/TestLogger.cpp +++ b/libc/test/UnitTest/TestLogger.cpp @@ -1,14 +1,13 @@ #include "test/UnitTest/TestLogger.h" +#include "hdr/stdint_proxy.h" #include "src/__support/CPP/string.h" #include "src/__support/CPP/string_view.h" -#include "src/__support/OSUtil/io.h" // write_to_stderr -#include "src/__support/big_int.h" // is_big_int +#include "src/__support/OSUtil/io.h" // write_to_stderr +#include "src/__support/big_int.h" // is_big_int #include "src/__support/macros/config.h" #include "src/__support/macros/properties/types.h" // LIBC_TYPES_HAS_INT128 #include "src/__support/uint128.h" -#include <stdint.h> - namespace LIBC_NAMESPACE_DECL { namespace testing { diff --git a/libc/test/integration/src/pthread/CMakeLists.txt b/libc/test/integration/src/pthread/CMakeLists.txt index 208ba3f..0bdd99c 100644 --- a/libc/test/integration/src/pthread/CMakeLists.txt +++ b/libc/test/integration/src/pthread/CMakeLists.txt @@ -7,6 +7,7 @@ add_integration_test( SRCS pthread_mutex_test.cpp DEPENDS + libc.hdr.stdint_proxy libc.include.pthread libc.src.errno.errno libc.src.pthread.pthread_mutex_destroy @@ -84,6 +85,7 @@ add_integration_test( SRCS pthread_test.cpp DEPENDS + libc.hdr.stdint_proxy libc.include.pthread libc.src.pthread.pthread_create libc.src.pthread.pthread_join @@ -96,6 +98,7 @@ add_integration_test( SRCS pthread_equal_test.cpp DEPENDS + libc.hdr.stdint_proxy libc.include.pthread libc.src.errno.errno libc.src.pthread.pthread_mutex_destroy @@ -115,6 +118,7 @@ add_integration_test( SRCS pthread_name_test.cpp DEPENDS + libc.hdr.stdint_proxy libc.include.pthread libc.src.errno.errno libc.src.pthread.pthread_create @@ -165,6 +169,7 @@ add_integration_test( SRCS pthread_once_test.cpp DEPENDS + libc.hdr.stdint_proxy libc.include.pthread libc.src.pthread.pthread_once libc.src.pthread.pthread_mutex_destroy diff --git a/libc/test/integration/src/pthread/pthread_equal_test.cpp b/libc/test/integration/src/pthread/pthread_equal_test.cpp index 82f5a49..01569798 100644 --- a/libc/test/integration/src/pthread/pthread_equal_test.cpp +++ b/libc/test/integration/src/pthread/pthread_equal_test.cpp @@ -6,6 +6,7 @@ // //===----------------------------------------------------------------------===// +#include "hdr/stdint_proxy.h" // uintptr_t #include "src/pthread/pthread_create.h" #include "src/pthread/pthread_equal.h" #include "src/pthread/pthread_join.h" @@ -14,11 +15,9 @@ #include "src/pthread/pthread_mutex_lock.h" #include "src/pthread/pthread_mutex_unlock.h" #include "src/pthread/pthread_self.h" - #include "test/IntegrationTest/test.h" #include <pthread.h> -#include <stdint.h> // uintptr_t pthread_t child_thread; pthread_mutex_t mutex; diff --git a/libc/test/integration/src/pthread/pthread_mutex_test.cpp b/libc/test/integration/src/pthread/pthread_mutex_test.cpp index 137daed..d41ad6d 100644 --- a/libc/test/integration/src/pthread/pthread_mutex_test.cpp +++ b/libc/test/integration/src/pthread/pthread_mutex_test.cpp @@ -6,18 +6,16 @@ // //===----------------------------------------------------------------------===// +#include "hdr/stdint_proxy.h" // uintptr_t +#include "src/pthread/pthread_create.h" +#include "src/pthread/pthread_join.h" #include "src/pthread/pthread_mutex_destroy.h" #include "src/pthread/pthread_mutex_init.h" #include "src/pthread/pthread_mutex_lock.h" #include "src/pthread/pthread_mutex_unlock.h" - -#include "src/pthread/pthread_create.h" -#include "src/pthread/pthread_join.h" - #include "test/IntegrationTest/test.h" #include <pthread.h> -#include <stdint.h> // uintptr_t constexpr int START = 0; constexpr int MAX = 10000; diff --git a/libc/test/integration/src/pthread/pthread_name_test.cpp b/libc/test/integration/src/pthread/pthread_name_test.cpp index 35dd3b1..343a223 100644 --- a/libc/test/integration/src/pthread/pthread_name_test.cpp +++ b/libc/test/integration/src/pthread/pthread_name_test.cpp @@ -6,6 +6,7 @@ // //===----------------------------------------------------------------------===// +#include "hdr/stdint_proxy.h" // uintptr_t #include "src/__support/CPP/string_view.h" #include "src/__support/libc_errno.h" #include "src/pthread/pthread_create.h" @@ -17,11 +18,9 @@ #include "src/pthread/pthread_mutex_unlock.h" #include "src/pthread/pthread_self.h" #include "src/pthread/pthread_setname_np.h" - #include "test/IntegrationTest/test.h" #include <pthread.h> -#include <stdint.h> // uintptr_t using string_view = LIBC_NAMESPACE::cpp::string_view; diff --git a/libc/test/integration/src/pthread/pthread_once_test.cpp b/libc/test/integration/src/pthread/pthread_once_test.cpp index 8e0f234..68aadf3 100644 --- a/libc/test/integration/src/pthread/pthread_once_test.cpp +++ b/libc/test/integration/src/pthread/pthread_once_test.cpp @@ -6,6 +6,7 @@ // //===----------------------------------------------------------------------===// +#include "hdr/stdint_proxy.h" // uintptr_t #include "src/__support/CPP/atomic.h" #include "src/pthread/pthread_create.h" #include "src/pthread/pthread_join.h" @@ -14,11 +15,9 @@ #include "src/pthread/pthread_mutex_lock.h" #include "src/pthread/pthread_mutex_unlock.h" #include "src/pthread/pthread_once.h" - #include "test/IntegrationTest/test.h" #include <pthread.h> -#include <stdint.h> // uintptr_t static constexpr unsigned int NUM_THREADS = 5; static LIBC_NAMESPACE::cpp::Atomic<unsigned int> thread_count; diff --git a/libc/test/integration/src/pthread/pthread_test.cpp b/libc/test/integration/src/pthread/pthread_test.cpp index 3565a7c..4d635fd 100644 --- a/libc/test/integration/src/pthread/pthread_test.cpp +++ b/libc/test/integration/src/pthread/pthread_test.cpp @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// +#include "hdr/stdint_proxy.h" // uintptr_t #include "src/pthread/pthread_create.h" #include "src/pthread/pthread_join.h" #include "test/IntegrationTest/test.h" #include <pthread.h> -#include <stdint.h> // uintptr_t static constexpr int thread_count = 1000; static int counter = 0; diff --git a/libc/test/integration/src/spawn/CMakeLists.txt b/libc/test/integration/src/spawn/CMakeLists.txt index caed59f..f3a7327 100644 --- a/libc/test/integration/src/spawn/CMakeLists.txt +++ b/libc/test/integration/src/spawn/CMakeLists.txt @@ -29,6 +29,7 @@ add_integration_test( DEPENDS libc_posix_spawn_test_binary libc.test.integration.src.spawn.test_binary_properties + libc.hdr.stdint_proxy libc.include.fcntl libc.include.signal libc.include.spawn diff --git a/libc/test/integration/src/spawn/posix_spawn_test.cpp b/libc/test/integration/src/spawn/posix_spawn_test.cpp index 104096c..3c8cc73 100644 --- a/libc/test/integration/src/spawn/posix_spawn_test.cpp +++ b/libc/test/integration/src/spawn/posix_spawn_test.cpp @@ -8,6 +8,7 @@ #include "test_binary_properties.h" +#include "hdr/stdint_proxy.h" #include "src/spawn/posix_spawn.h" #include "src/spawn/posix_spawn_file_actions_addopen.h" #include "src/spawn/posix_spawn_file_actions_destroy.h" @@ -18,7 +19,6 @@ #include <fcntl.h> #include <spawn.h> #include <stddef.h> -#include <stdint.h> #include <sys/wait.h> char arg0[] = "libc_posix_spawn_test_binary"; diff --git a/libc/test/shared/CMakeLists.txt b/libc/test/shared/CMakeLists.txt index 89b607d..e93fbb9 100644 --- a/libc/test/shared/CMakeLists.txt +++ b/libc/test/shared/CMakeLists.txt @@ -12,6 +12,10 @@ add_fp_unittest( libc.src.__support.math.acosf16 libc.src.__support.math.acoshf libc.src.__support.math.acoshf16 + libc.src.__support.math.acospif16 + libc.src.__support.math.asin + libc.src.__support.math.asinf + libc.src.__support.math.asinf16 libc.src.__support.math.erff libc.src.__support.math.exp libc.src.__support.math.exp10 diff --git a/libc/test/shared/shared_math_test.cpp b/libc/test/shared/shared_math_test.cpp index 8d3cebd..51d38ec 100644 --- a/libc/test/shared/shared_math_test.cpp +++ b/libc/test/shared/shared_math_test.cpp @@ -8,64 +8,72 @@ #include "shared/math.h" #include "test/UnitTest/FPMatcher.h" +#include "test/UnitTest/Test.h" #ifdef LIBC_TYPES_HAS_FLOAT16 TEST(LlvmLibcSharedMathTest, AllFloat16) { int exponent; - EXPECT_FP_EQ(0x0p+0f, LIBC_NAMESPACE::shared::acoshf16(1.0f)); + EXPECT_FP_EQ(0x0p+0f16, LIBC_NAMESPACE::shared::acoshf16(1.0f16)); + EXPECT_FP_EQ(0x0p+0f16, LIBC_NAMESPACE::shared::acospif16(1.0f16)); + EXPECT_FP_EQ(0x0p+0f16, LIBC_NAMESPACE::shared::asinf16(0.0f16)); EXPECT_FP_EQ(0x1p+0f16, LIBC_NAMESPACE::shared::exp10f16(0.0f16)); EXPECT_FP_EQ(0x1p+0f16, LIBC_NAMESPACE::shared::expf16(0.0f16)); - ASSERT_FP_EQ(float16(8 << 5), LIBC_NAMESPACE::shared::ldexpf16(float(8), 5)); + ASSERT_FP_EQ(float16(8 << 5), LIBC_NAMESPACE::shared::ldexpf16(8.0f16, 5)); ASSERT_FP_EQ(float16(-1 * (8 << 5)), - LIBC_NAMESPACE::shared::ldexpf16(float(-8), 5)); + LIBC_NAMESPACE::shared::ldexpf16(-8.0f16, 5)); - EXPECT_FP_EQ_ALL_ROUNDING(0.75f16, - LIBC_NAMESPACE::shared::frexpf16(24.0f, &exponent)); + EXPECT_FP_EQ_ALL_ROUNDING( + 0.75f16, LIBC_NAMESPACE::shared::frexpf16(24.0f16, &exponent)); EXPECT_EQ(exponent, 5); EXPECT_FP_EQ(0x1.921fb6p+0f16, LIBC_NAMESPACE::shared::acosf16(0.0f16)); } -#endif +#endif // LIBC_TYPES_HAS_FLOAT16 TEST(LlvmLibcSharedMathTest, AllFloat) { int exponent; EXPECT_FP_EQ(0x1.921fb6p+0, LIBC_NAMESPACE::shared::acosf(0.0f)); + EXPECT_FP_EQ(0x0p+0f, LIBC_NAMESPACE::shared::acoshf(1.0f)); + EXPECT_FP_EQ(0x0p+0f, LIBC_NAMESPACE::shared::asinf(0.0f)); + EXPECT_FP_EQ(0x0p+0f, LIBC_NAMESPACE::shared::erff(0.0f)); EXPECT_FP_EQ(0x1p+0f, LIBC_NAMESPACE::shared::exp10f(0.0f)); EXPECT_FP_EQ(0x1p+0f, LIBC_NAMESPACE::shared::expf(0.0f)); - EXPECT_FP_EQ(0x0p+0f, LIBC_NAMESPACE::shared::erff(0.0f)); - EXPECT_FP_EQ(0x0p+0f, LIBC_NAMESPACE::shared::acoshf(1.0f)); EXPECT_FP_EQ_ALL_ROUNDING(0.75f, LIBC_NAMESPACE::shared::frexpf(24.0f, &exponent)); EXPECT_EQ(exponent, 5); - ASSERT_FP_EQ(float(8 << 5), LIBC_NAMESPACE::shared::ldexpf(float(8), 5)); - ASSERT_FP_EQ(float(-1 * (8 << 5)), - LIBC_NAMESPACE::shared::ldexpf(float(-8), 5)); + ASSERT_FP_EQ(float(8 << 5), LIBC_NAMESPACE::shared::ldexpf(8.0f, 5)); + ASSERT_FP_EQ(float(-1 * (8 << 5)), LIBC_NAMESPACE::shared::ldexpf(-8.0f, 5)); } TEST(LlvmLibcSharedMathTest, AllDouble) { EXPECT_FP_EQ(0x1.921fb54442d18p+0, LIBC_NAMESPACE::shared::acos(0.0)); + EXPECT_FP_EQ(0x0p+0, LIBC_NAMESPACE::shared::asin(0.0)); EXPECT_FP_EQ(0x1p+0, LIBC_NAMESPACE::shared::exp(0.0)); EXPECT_FP_EQ(0x1p+0, LIBC_NAMESPACE::shared::exp10(0.0)); } +#ifdef LIBC_TYPES_HAS_FLOAT128 + TEST(LlvmLibcSharedMathTest, AllFloat128) { int exponent; - EXPECT_FP_EQ_ALL_ROUNDING( - float128(0.75), LIBC_NAMESPACE::shared::frexpf128(24.0f, &exponent)); + EXPECT_FP_EQ_ALL_ROUNDING(float128(0.75), LIBC_NAMESPACE::shared::frexpf128( + float128(24), &exponent)); EXPECT_EQ(exponent, 5); ASSERT_FP_EQ(float128(8 << 5), - LIBC_NAMESPACE::shared::ldexpf128(float(8), 5)); + LIBC_NAMESPACE::shared::ldexpf128(float128(8), 5)); ASSERT_FP_EQ(float128(-1 * (8 << 5)), - LIBC_NAMESPACE::shared::ldexpf128(float(-8), 5)); + LIBC_NAMESPACE::shared::ldexpf128(float128(-8), 5)); } + +#endif // LIBC_TYPES_HAS_FLOAT128 diff --git a/libc/test/src/CMakeLists.txt b/libc/test/src/CMakeLists.txt index b3eba43..c576e08 100644 --- a/libc/test/src/CMakeLists.txt +++ b/libc/test/src/CMakeLists.txt @@ -51,7 +51,9 @@ function(add_fp_unittest name) ${test_type} LINK_LIBRARIES "${MATH_UNITTEST_LINK_LIBRARIES}" "${MATH_UNITTEST_UNPARSED_ARGUMENTS}" - DEPENDS "${deps}" + DEPENDS + libc.hdr.stdint_proxy + "${deps}" ) endfunction(add_fp_unittest) diff --git a/libc/test/src/__support/CMakeLists.txt b/libc/test/src/__support/CMakeLists.txt index e54d7a5..5d1d0e0 100644 --- a/libc/test/src/__support/CMakeLists.txt +++ b/libc/test/src/__support/CMakeLists.txt @@ -265,6 +265,7 @@ add_libc_test( SRCS str_to_float_comparison_test.cpp DEPENDS + libc.hdr.stdint_proxy libc.src.stdio.printf libc.src.stdio.fopen libc.src.stdio.fclose diff --git a/libc/test/src/__support/CPP/CMakeLists.txt b/libc/test/src/__support/CPP/CMakeLists.txt index 2b4d610..3e1379d 100644 --- a/libc/test/src/__support/CPP/CMakeLists.txt +++ b/libc/test/src/__support/CPP/CMakeLists.txt @@ -27,6 +27,7 @@ add_libc_test( SRCS bit_test.cpp DEPENDS + libc.hdr.stdint_proxy libc.src.__support.big_int libc.src.__support.CPP.bit libc.src.__support.macros.properties.types diff --git a/libc/test/src/__support/CPP/bit_test.cpp b/libc/test/src/__support/CPP/bit_test.cpp index 89e2a75..891e693 100644 --- a/libc/test/src/__support/CPP/bit_test.cpp +++ b/libc/test/src/__support/CPP/bit_test.cpp @@ -6,14 +6,13 @@ // //===----------------------------------------------------------------------===// +#include "hdr/stdint_proxy.h" #include "src/__support/CPP/bit.h" #include "src/__support/big_int.h" #include "src/__support/macros/config.h" #include "src/__support/macros/properties/types.h" // LIBC_TYPES_HAS_INT128 #include "test/UnitTest/Test.h" -#include <stdint.h> - namespace LIBC_NAMESPACE_DECL { namespace cpp { diff --git a/libc/test/src/__support/FPUtil/CMakeLists.txt b/libc/test/src/__support/FPUtil/CMakeLists.txt index 039c700..81db4cc 100644 --- a/libc/test/src/__support/FPUtil/CMakeLists.txt +++ b/libc/test/src/__support/FPUtil/CMakeLists.txt @@ -55,3 +55,15 @@ add_fp_unittest( DEPENDS libc.src.__support.FPUtil.bfloat16 ) + +add_fp_unittest( + comparison_operations_test + SUITE + libc-fputil-tests + SRCS + comparison_operations_test.cpp + DEPENDS + libc.src.__support.FPUtil.bfloat16 + libc.src.__support.FPUtil.comparison_operations + libc.src.__support.macros.properties.types +) diff --git a/libc/test/src/__support/FPUtil/comparison_operations_test.cpp b/libc/test/src/__support/FPUtil/comparison_operations_test.cpp new file mode 100644 index 0000000..04a3321 --- /dev/null +++ b/libc/test/src/__support/FPUtil/comparison_operations_test.cpp @@ -0,0 +1,350 @@ +//===-- Unittests for comparison operations on floating-point numbers -----===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +#include "src/__support/FPUtil/bfloat16.h" +#include "src/__support/FPUtil/comparison_operations.h" +#include "src/__support/macros/properties/types.h" +#include "test/UnitTest/FEnvSafeTest.h" +#include "test/UnitTest/FPMatcher.h" +#include "test/UnitTest/Test.h" + +using LIBC_NAMESPACE::fputil::equals; +using LIBC_NAMESPACE::fputil::greater_than; +using LIBC_NAMESPACE::fputil::greater_than_or_equals; +using LIBC_NAMESPACE::fputil::less_than; +using LIBC_NAMESPACE::fputil::less_than_or_equals; + +using BFloat16 = LIBC_NAMESPACE::fputil::BFloat16; + +template <typename T> +class ComparisonOperationsTest : public LIBC_NAMESPACE::testing::FEnvSafeTest { + DECLARE_SPECIAL_CONSTANTS(T) + + // TODO: Make these constexpr once quick_get_round is made constexpr. + T normal1; + T neg_normal1; + T normal2; + T small; + T neg_small; + T large; + T neg_large; + +public: + void SetUp() override { + with_fenv_preserved([this]() { + normal1 = T(3.14); + neg_normal1 = T(-3.14); + normal2 = T(2.71); + small = T(0.1); + neg_small = T(-0.1); + large = T(10000.0); + neg_large = T(-10000.0); + }); + } + + void test_equals() { + EXPECT_TRUE(equals(neg_zero, neg_zero)); + EXPECT_TRUE(equals(zero, neg_zero)); + EXPECT_TRUE(equals(neg_zero, zero)); + + EXPECT_TRUE(equals(inf, inf)); + EXPECT_TRUE(equals(neg_inf, neg_inf)); + EXPECT_FALSE(equals(inf, neg_inf)); + EXPECT_FALSE(equals(neg_inf, inf)); + + EXPECT_TRUE(equals(normal1, normal1)); + EXPECT_TRUE(equals(normal2, normal2)); + EXPECT_FALSE(equals(normal1, normal2)); + EXPECT_FALSE(equals(normal1, neg_normal1)); + + auto test_qnan = [&](T x, T y) { + LIBC_NAMESPACE::fputil::clear_except(FE_ALL_EXCEPT); + EXPECT_FALSE(equals(x, y)); + EXPECT_FP_EXCEPTION(0); + }; + + test_qnan(aNaN, aNaN); + test_qnan(aNaN, neg_aNaN); + test_qnan(aNaN, zero); + test_qnan(aNaN, inf); + test_qnan(aNaN, normal1); + + test_qnan(neg_aNaN, neg_aNaN); + test_qnan(neg_aNaN, aNaN); + test_qnan(neg_aNaN, zero); + test_qnan(neg_aNaN, inf); + test_qnan(neg_aNaN, normal1); + + auto test_snan = [&](T x, T y) { + LIBC_NAMESPACE::fputil::clear_except(FE_ALL_EXCEPT); + EXPECT_FALSE(equals(x, y)); + EXPECT_FP_EXCEPTION(FE_INVALID); + }; + + test_snan(sNaN, sNaN); + test_snan(sNaN, neg_sNaN); + test_snan(sNaN, aNaN); + test_snan(sNaN, neg_aNaN); + test_snan(sNaN, zero); + test_snan(sNaN, neg_zero); + test_snan(sNaN, inf); + test_snan(sNaN, neg_inf); + test_snan(sNaN, normal1); + + test_snan(neg_sNaN, neg_sNaN); + test_snan(neg_sNaN, sNaN); + test_snan(neg_sNaN, aNaN); + test_snan(neg_sNaN, neg_aNaN); + test_snan(neg_sNaN, zero); + test_snan(neg_sNaN, neg_zero); + test_snan(neg_sNaN, inf); + test_snan(neg_sNaN, neg_inf); + test_snan(neg_sNaN, normal1); + } + + void test_less_than() { + EXPECT_TRUE(less_than(neg_small, small)); + EXPECT_TRUE(less_than(small, large)); + + EXPECT_TRUE(less_than(neg_large, neg_small)); + EXPECT_FALSE(less_than(large, small)); + EXPECT_FALSE(less_than(small, neg_small)); + + EXPECT_FALSE(less_than(zero, neg_zero)); + EXPECT_FALSE(less_than(neg_zero, zero)); + EXPECT_FALSE(less_than(zero, zero)); + + EXPECT_TRUE(less_than(neg_small, zero)); + EXPECT_TRUE(less_than(neg_zero, small)); + EXPECT_FALSE(less_than(small, zero)); + + EXPECT_TRUE(less_than(neg_inf, inf)); + EXPECT_TRUE(less_than(neg_inf, neg_small)); + EXPECT_TRUE(less_than(small, inf)); + EXPECT_FALSE(less_than(inf, small)); + + EXPECT_FALSE(less_than(small, small)); + EXPECT_FALSE(less_than(neg_inf, neg_inf)); + + auto test_qnan = [&](T x, T y) { + LIBC_NAMESPACE::fputil::clear_except(FE_ALL_EXCEPT); + EXPECT_FALSE(less_than(x, y)); + EXPECT_FP_EXCEPTION(FE_INVALID); + }; + + test_qnan(aNaN, small); + test_qnan(small, aNaN); + test_qnan(aNaN, aNaN); + test_qnan(neg_aNaN, neg_small); + test_qnan(neg_small, neg_aNaN); + test_qnan(neg_aNaN, neg_aNaN); + + auto test_snan = [&](T x, T y) { + LIBC_NAMESPACE::fputil::clear_except(FE_ALL_EXCEPT); + EXPECT_FALSE(less_than(x, y)); + EXPECT_FP_EXCEPTION(FE_INVALID); + }; + + test_snan(sNaN, small); + test_snan(sNaN, neg_small); + test_snan(sNaN, zero); + test_snan(sNaN, inf); + test_snan(sNaN, aNaN); + test_snan(sNaN, sNaN); + + test_snan(neg_sNaN, small); + test_snan(neg_sNaN, neg_small); + test_snan(neg_sNaN, zero); + test_snan(neg_sNaN, inf); + test_snan(neg_sNaN, aNaN); + test_snan(neg_sNaN, neg_sNaN); + } + + void test_greater_than() { + EXPECT_TRUE(greater_than(large, neg_small)); + EXPECT_TRUE(greater_than(neg_small, neg_large)); + + EXPECT_FALSE(greater_than(large, large)); + EXPECT_FALSE(greater_than(neg_small, large)); + + EXPECT_FALSE(greater_than(zero, neg_zero)); + EXPECT_FALSE(greater_than(neg_zero, zero)); + + EXPECT_TRUE(greater_than(inf, neg_inf)); + EXPECT_TRUE(greater_than(inf, large)); + EXPECT_TRUE(greater_than(large, neg_inf)); + EXPECT_FALSE(greater_than(neg_inf, inf)); + + EXPECT_FALSE(greater_than(large, large)); + EXPECT_FALSE(greater_than(inf, inf)); + + auto test_qnan = [&](T x, T y) { + LIBC_NAMESPACE::fputil::clear_except(FE_ALL_EXCEPT); + EXPECT_FALSE(greater_than(x, y)); + EXPECT_FP_EXCEPTION(FE_INVALID); + }; + + test_qnan(aNaN, large); + test_qnan(large, aNaN); + test_qnan(aNaN, aNaN); + test_qnan(neg_aNaN, neg_small); + test_qnan(neg_small, neg_aNaN); + test_qnan(neg_aNaN, neg_aNaN); + + auto test_snan = [&](T x, T y) { + LIBC_NAMESPACE::fputil::clear_except(FE_ALL_EXCEPT); + EXPECT_FALSE(greater_than(x, y)); + EXPECT_FP_EXCEPTION(FE_INVALID); + }; + + test_snan(sNaN, large); + test_snan(sNaN, neg_small); + test_snan(sNaN, zero); + test_snan(sNaN, inf); + test_snan(sNaN, aNaN); + test_snan(sNaN, sNaN); + + test_snan(neg_sNaN, large); + test_snan(neg_sNaN, neg_small); + test_snan(neg_sNaN, zero); + test_snan(neg_sNaN, inf); + test_snan(neg_sNaN, aNaN); + test_snan(neg_sNaN, neg_sNaN); + } + + void test_less_than_or_equals() { + EXPECT_TRUE(less_than_or_equals(neg_small, small)); + EXPECT_TRUE(less_than_or_equals(small, large)); + EXPECT_TRUE(less_than_or_equals(neg_inf, small)); + + EXPECT_TRUE(less_than_or_equals(small, small)); + EXPECT_TRUE(less_than_or_equals(zero, neg_zero)); + EXPECT_TRUE(less_than_or_equals(inf, inf)); + + EXPECT_FALSE(less_than_or_equals(small, neg_small)); + EXPECT_FALSE(less_than_or_equals(large, small)); + EXPECT_FALSE(less_than_or_equals(inf, small)); + + EXPECT_TRUE(less_than_or_equals(neg_large, small)); + EXPECT_FALSE(less_than_or_equals(large, neg_small)); + + auto test_qnan = [&](T x, T y) { + LIBC_NAMESPACE::fputil::clear_except(FE_ALL_EXCEPT); + EXPECT_FALSE(less_than_or_equals(x, y)); + EXPECT_FP_EXCEPTION(FE_INVALID); + }; + + test_qnan(aNaN, small); + test_qnan(small, aNaN); + test_qnan(aNaN, aNaN); + test_qnan(neg_aNaN, neg_small); + test_qnan(neg_small, neg_aNaN); + test_qnan(neg_aNaN, neg_aNaN); + + auto test_snan = [&](T x, T y) { + LIBC_NAMESPACE::fputil::clear_except(FE_ALL_EXCEPT); + EXPECT_FALSE(less_than_or_equals(x, y)); + EXPECT_FP_EXCEPTION(FE_INVALID); + }; + + test_snan(sNaN, small); + test_snan(sNaN, neg_small); + test_snan(sNaN, zero); + test_snan(sNaN, inf); + test_snan(sNaN, aNaN); + test_snan(sNaN, sNaN); + + test_snan(neg_sNaN, small); + test_snan(neg_sNaN, neg_small); + test_snan(neg_sNaN, zero); + test_snan(neg_sNaN, inf); + test_snan(neg_sNaN, aNaN); + test_snan(neg_sNaN, neg_sNaN); + } + + void test_greater_than_or_equals() { + EXPECT_TRUE(greater_than_or_equals(small, neg_small)); + EXPECT_TRUE(greater_than_or_equals(large, small)); + EXPECT_TRUE(greater_than_or_equals(inf, small)); + + EXPECT_TRUE(greater_than_or_equals(small, small)); + EXPECT_TRUE(greater_than_or_equals(zero, neg_zero)); + EXPECT_TRUE(greater_than_or_equals(neg_inf, neg_inf)); + + EXPECT_FALSE(greater_than_or_equals(neg_small, small)); + EXPECT_FALSE(greater_than_or_equals(small, large)); + EXPECT_FALSE(greater_than_or_equals(neg_inf, small)); + + EXPECT_TRUE(greater_than_or_equals(large, neg_small)); + EXPECT_FALSE(greater_than_or_equals(neg_large, small)); + + auto test_qnan = [&](T x, T y) { + LIBC_NAMESPACE::fputil::clear_except(FE_ALL_EXCEPT); + EXPECT_FALSE(greater_than_or_equals(x, y)); + EXPECT_FP_EXCEPTION(FE_INVALID); + }; + + test_qnan(aNaN, small); + test_qnan(small, aNaN); + test_qnan(aNaN, aNaN); + test_qnan(neg_aNaN, neg_small); + test_qnan(neg_small, neg_aNaN); + test_qnan(neg_aNaN, neg_aNaN); + + auto test_snan = [&](T x, T y) { + LIBC_NAMESPACE::fputil::clear_except(FE_ALL_EXCEPT); + EXPECT_FALSE(greater_than_or_equals(x, y)); + EXPECT_FP_EXCEPTION(FE_INVALID); + }; + + test_snan(sNaN, small); + test_snan(sNaN, neg_small); + test_snan(sNaN, zero); + test_snan(sNaN, inf); + test_snan(sNaN, aNaN); + test_snan(sNaN, sNaN); + + test_snan(neg_sNaN, small); + test_snan(neg_sNaN, neg_small); + test_snan(neg_sNaN, zero); + test_snan(neg_sNaN, inf); + test_snan(neg_sNaN, aNaN); + test_snan(neg_sNaN, neg_sNaN); + } +}; + +#define TEST_COMPARISON_OPS(Name, Type) \ + using LlvmLibc##Name##ComparisonOperationsTest = \ + ComparisonOperationsTest<Type>; \ + TEST_F(LlvmLibc##Name##ComparisonOperationsTest, Equals) { test_equals(); } \ + TEST_F(LlvmLibc##Name##ComparisonOperationsTest, LessThan) { \ + test_less_than(); \ + } \ + TEST_F(LlvmLibc##Name##ComparisonOperationsTest, GreaterThan) { \ + test_greater_than(); \ + } \ + TEST_F(LlvmLibc##Name##ComparisonOperationsTest, LessThanOrEquals) { \ + test_less_than_or_equals(); \ + } \ + TEST_F(LlvmLibc##Name##ComparisonOperationsTest, GreaterThanOrEquals) { \ + test_greater_than_or_equals(); \ + } + +TEST_COMPARISON_OPS(Float, float) +TEST_COMPARISON_OPS(Double, double) +TEST_COMPARISON_OPS(LongDouble, long double) + +#ifdef LIBC_TYPES_HAS_FLOAT16 +TEST_COMPARISON_OPS(Float16, float16) +#endif // LIBC_TYPES_HAS_FLOAT16 + +#ifdef LIBC_TYPES_HAS_FLOAT128 +TEST_COMPARISON_OPS(Float128, float128) +#endif // LIBC_TYPES_HAS_FLOAT128 + +TEST_COMPARISON_OPS(BFloat16, BFloat16) diff --git a/libc/test/src/__support/HashTable/CMakeLists.txt b/libc/test/src/__support/HashTable/CMakeLists.txt index f84835f..55e9864 100644 --- a/libc/test/src/__support/HashTable/CMakeLists.txt +++ b/libc/test/src/__support/HashTable/CMakeLists.txt @@ -30,6 +30,7 @@ add_libc_test( SRCS group_test.cpp DEPENDS + libc.hdr.stdint_proxy libc.src.__support.HashTable.bitmask libc.src.stdlib.rand libc.src.search.hsearch diff --git a/libc/test/src/__support/HashTable/group_test.cpp b/libc/test/src/__support/HashTable/group_test.cpp index acdc58e..890ca00 100644 --- a/libc/test/src/__support/HashTable/group_test.cpp +++ b/libc/test/src/__support/HashTable/group_test.cpp @@ -8,11 +8,11 @@ #include "src/__support/HashTable/bitmask.h" +#include "hdr/stdint_proxy.h" #include "src/__support/CPP/bit.h" #include "src/__support/macros/config.h" #include "src/stdlib/rand.h" #include "test/UnitTest/Test.h" -#include <stdint.h> namespace LIBC_NAMESPACE_DECL { namespace internal { diff --git a/libc/test/src/__support/str_to_float_comparison_test.cpp b/libc/test/src/__support/str_to_float_comparison_test.cpp index 6e89ce2..18be22a 100644 --- a/libc/test/src/__support/str_to_float_comparison_test.cpp +++ b/libc/test/src/__support/str_to_float_comparison_test.cpp @@ -6,6 +6,7 @@ // //===----------------------------------------------------------------------===// +#include "hdr/stdint_proxy.h" #include "src/__support/CPP/bit.h" #include "src/stdio/fclose.h" #include "src/stdio/fgets.h" @@ -17,7 +18,6 @@ #include "src/string/strdup.h" #include "src/string/strtok.h" #include "test/UnitTest/Test.h" -#include <stdint.h> // The intent of this test is to read in files in the format used in this test // dataset: https://github.com/nigeltao/parse-number-fxx-test-data diff --git a/libc/test/src/__support/wchar/CMakeLists.txt b/libc/test/src/__support/wchar/CMakeLists.txt index f072745..c112c83 100644 --- a/libc/test/src/__support/wchar/CMakeLists.txt +++ b/libc/test/src/__support/wchar/CMakeLists.txt @@ -34,3 +34,20 @@ add_libc_test( libc.hdr.errno_macros libc.hdr.types.char32_t ) + +add_libc_test( + wcsnrtombs_test + SUITE + libc-support-tests + SRCS + wcsnrtombs_test.cpp + DEPENDS + libc.src.__support.wchar.string_converter + libc.src.__support.wchar.character_converter + libc.src.__support.wchar.mbstate + libc.src.__support.error_or + libc.src.__support.wchar.wcsnrtombs + libc.hdr.errno_macros + libc.hdr.types.char32_t + libc.hdr.types.char8_t +) diff --git a/libc/test/src/__support/wchar/wcsnrtombs_test.cpp b/libc/test/src/__support/wchar/wcsnrtombs_test.cpp new file mode 100644 index 0000000..2d431ed --- /dev/null +++ b/libc/test/src/__support/wchar/wcsnrtombs_test.cpp @@ -0,0 +1,213 @@ +//===-- Unittests for wcsnrtombs ------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +#include "hdr/errno_macros.h" +#include "hdr/types/size_t.h" +#include "hdr/types/wchar_t.h" +#include "src/__support/error_or.h" +#include "src/__support/macros/null_check.h" +#include "src/__support/macros/properties/os.h" +#include "src/__support/wchar/mbstate.h" +#include "src/__support/wchar/wcsnrtombs.h" +#include "test/UnitTest/Test.h" + +// TODO: add support for 16-bit widechars to remove this macro +#ifdef LIBC_TARGET_OS_IS_WINDOWS +TEST(LlvmLibcStringConverterTest, Windows) { + // pass on windows for now +} + +#else + +TEST(LlvmLibcWcsnrtombs, AllMultibyteLengths) { + LIBC_NAMESPACE::internal::mbstate state; + + /// clown emoji, sigma symbol, y with diaeresis, letter A + const wchar_t src[] = {static_cast<wchar_t>(0x1f921), + static_cast<wchar_t>(0x2211), + static_cast<wchar_t>(0xff), static_cast<wchar_t>(0x41), + static_cast<wchar_t>(0x0)}; + const wchar_t *cur = src; + char mbs[11]; + + auto res = LIBC_NAMESPACE::internal::wcsnrtombs(mbs, &cur, 5, 11, &state); + ASSERT_TRUE(res.has_value()); + ASSERT_EQ(res.value(), static_cast<size_t>(10)); + ASSERT_EQ(cur, nullptr); + ASSERT_EQ(mbs[0], '\xF0'); // clown begin + ASSERT_EQ(mbs[1], '\x9F'); + ASSERT_EQ(mbs[2], '\xA4'); + ASSERT_EQ(mbs[3], '\xA1'); + ASSERT_EQ(mbs[4], '\xE2'); // sigma begin + ASSERT_EQ(mbs[5], '\x88'); + ASSERT_EQ(mbs[6], '\x91'); + ASSERT_EQ(mbs[7], '\xC3'); // y diaeresis begin + ASSERT_EQ(mbs[8], '\xBF'); + ASSERT_EQ(mbs[9], '\x41'); // A begin + ASSERT_EQ(mbs[10], '\0'); // null terminator +} + +TEST(LlvmLibcWcsnrtombs, DestLimit) { + LIBC_NAMESPACE::internal::mbstate state1; + + /// clown emoji, sigma symbol, y with diaeresis, letter A + const wchar_t src[] = {static_cast<wchar_t>(0x1f921), + static_cast<wchar_t>(0x2211), + static_cast<wchar_t>(0xff), static_cast<wchar_t>(0x41), + static_cast<wchar_t>(0x0)}; + const wchar_t *cur = src; + + char mbs[11]; + for (int i = 0; i < 11; ++i) + mbs[i] = '\x01'; // dummy initial values + + auto res = LIBC_NAMESPACE::internal::wcsnrtombs(mbs, &cur, 5, 4, &state1); + ASSERT_TRUE(res.has_value()); + ASSERT_EQ(res.value(), static_cast<size_t>(4)); + ASSERT_EQ(cur, src + 1); + ASSERT_EQ(mbs[0], '\xF0'); + ASSERT_EQ(mbs[1], '\x9F'); + ASSERT_EQ(mbs[2], '\xA4'); + ASSERT_EQ(mbs[3], '\xA1'); + ASSERT_EQ(mbs[4], '\x01'); // didn't write more than 4 bytes + + for (int i = 0; i < 11; ++i) + mbs[i] = '\x01'; // dummy initial values + LIBC_NAMESPACE::internal::mbstate state2; + + // not enough bytes to convert the second character, so only converts one + cur = src; + res = LIBC_NAMESPACE::internal::wcsnrtombs(mbs, &cur, 5, 6, &state2); + ASSERT_TRUE(res.has_value()); + ASSERT_EQ(res.value(), static_cast<size_t>(4)); + ASSERT_EQ(cur, src + 1); + ASSERT_EQ(mbs[0], '\xF0'); + ASSERT_EQ(mbs[1], '\x9F'); + ASSERT_EQ(mbs[2], '\xA4'); + ASSERT_EQ(mbs[3], '\xA1'); + ASSERT_EQ(mbs[4], '\x01'); +} + +TEST(LlvmLibcWcsnrtombs, SrcLimit) { + LIBC_NAMESPACE::internal::mbstate state; + + /// clown emoji, sigma symbol, y with diaeresis, letter A + const wchar_t src[] = {static_cast<wchar_t>(0x1f921), + static_cast<wchar_t>(0x2211), + static_cast<wchar_t>(0xff), static_cast<wchar_t>(0x41), + static_cast<wchar_t>(0x0)}; + const wchar_t *cur = src; + + char mbs[11]; + for (int i = 0; i < 11; ++i) + mbs[i] = '\x01'; // dummy initial values + + auto res = LIBC_NAMESPACE::internal::wcsnrtombs(mbs, &cur, 2, 11, &state); + ASSERT_TRUE(res.has_value()); + ASSERT_EQ(res.value(), static_cast<size_t>(7)); + ASSERT_EQ(cur, src + 2); + ASSERT_EQ(mbs[0], '\xF0'); // clown begin + ASSERT_EQ(mbs[1], '\x9F'); + ASSERT_EQ(mbs[2], '\xA4'); + ASSERT_EQ(mbs[3], '\xA1'); + ASSERT_EQ(mbs[4], '\xE2'); // sigma begin + ASSERT_EQ(mbs[5], '\x88'); + ASSERT_EQ(mbs[6], '\x91'); + ASSERT_EQ(mbs[7], '\x01'); + + res = LIBC_NAMESPACE::internal::wcsnrtombs(mbs + res.value(), &cur, 100, 11, + &state); + ASSERT_TRUE(res.has_value()); + ASSERT_EQ(res.value(), static_cast<size_t>(3)); + ASSERT_EQ(cur, nullptr); + ASSERT_EQ(mbs[0], '\xF0'); // clown begin + ASSERT_EQ(mbs[1], '\x9F'); + ASSERT_EQ(mbs[2], '\xA4'); + ASSERT_EQ(mbs[3], '\xA1'); + ASSERT_EQ(mbs[4], '\xE2'); // sigma begin + ASSERT_EQ(mbs[5], '\x88'); + ASSERT_EQ(mbs[6], '\x91'); + ASSERT_EQ(mbs[7], '\xC3'); // y diaeresis begin + ASSERT_EQ(mbs[8], '\xBF'); + ASSERT_EQ(mbs[9], '\x41'); // A begin + ASSERT_EQ(mbs[10], '\0'); // null terminator +} + +TEST(LlvmLibcWcsnrtombs, NullDest) { + LIBC_NAMESPACE::internal::mbstate state1; + + const wchar_t src[] = {static_cast<wchar_t>(0x1f921), + static_cast<wchar_t>(0x2211), + static_cast<wchar_t>(0xff), static_cast<wchar_t>(0x41), + static_cast<wchar_t>(0x0)}; + const wchar_t *cur = src; + + // n parameter ignored when dest is null + auto res = LIBC_NAMESPACE::internal::wcsnrtombs(nullptr, &cur, 5, 1, &state1); + ASSERT_TRUE(res.has_value()); + ASSERT_EQ(res.value(), static_cast<size_t>(10)); + ASSERT_EQ(cur, src); // pointer not updated when dest = null + + LIBC_NAMESPACE::internal::mbstate state2; + res = LIBC_NAMESPACE::internal::wcsnrtombs(nullptr, &cur, 5, 100, &state2); + ASSERT_TRUE(res.has_value()); + ASSERT_EQ(res.value(), static_cast<size_t>(10)); + ASSERT_EQ(cur, src); +} + +TEST(LlvmLibcWcsnrtombs, InvalidState) { + // this is more thoroughly tested by CharacterConverter + LIBC_NAMESPACE::internal::mbstate state; + state.total_bytes = 100; + + const wchar_t src[] = {static_cast<wchar_t>(0x1f921), + static_cast<wchar_t>(0x2211), + static_cast<wchar_t>(0xff), static_cast<wchar_t>(0x41), + static_cast<wchar_t>(0x0)}; + const wchar_t *cur = src; + + // n parameter ignored when dest is null + auto res = LIBC_NAMESPACE::internal::wcsnrtombs(nullptr, &cur, 5, 1, &state); + ASSERT_FALSE(res.has_value()); + ASSERT_EQ(res.error(), EINVAL); +} + +TEST(LlvmLibcWcsnrtombs, InvalidCharacter) { + LIBC_NAMESPACE::internal::mbstate state1; + + const wchar_t src[] = {static_cast<wchar_t>(0x1f921), + static_cast<wchar_t>(0x2211), + static_cast<wchar_t>(0x12ffff), // invalid widechar + static_cast<wchar_t>(0x0)}; + const wchar_t *cur = src; + char mbs[11]; + + // n parameter ignored when dest is null + auto res = LIBC_NAMESPACE::internal::wcsnrtombs(mbs, &cur, 5, 7, &state1); + ASSERT_TRUE(res.has_value()); + ASSERT_EQ(res.value(), static_cast<size_t>(7)); + + LIBC_NAMESPACE::internal::mbstate state2; + cur = src; + res = LIBC_NAMESPACE::internal::wcsnrtombs(mbs, &cur, 5, 11, &state2); + ASSERT_FALSE(res.has_value()); + ASSERT_EQ(res.error(), EILSEQ); +} + +#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER) +TEST(LlvmLibcWcsnrtombs, NullSrc) { + EXPECT_DEATH( + [] { + LIBC_NAMESPACE::internal::mbstate state; + char mbs[10]; + LIBC_NAMESPACE::internal::wcsnrtombs(mbs, nullptr, 1, 1, &state); + }, + WITH_SIGNAL(-1)); +} +#endif // LIBC_HAS_ADDRESS_SANITIZER +#endif diff --git a/libc/test/src/fenv/feclearexcept_test.cpp b/libc/test/src/fenv/feclearexcept_test.cpp index 52adda4..f39cf4ec 100644 --- a/libc/test/src/fenv/feclearexcept_test.cpp +++ b/libc/test/src/fenv/feclearexcept_test.cpp @@ -13,7 +13,6 @@ #include "test/UnitTest/Test.h" #include "hdr/fenv_macros.h" -#include <stdint.h> #include "excepts.h" diff --git a/libc/test/src/math/FmaTest.h b/libc/test/src/math/FmaTest.h index 5c5419c..902ff04 100644 --- a/libc/test/src/math/FmaTest.h +++ b/libc/test/src/math/FmaTest.h @@ -48,7 +48,8 @@ class FmaTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest { InStorageType get_random_bit_pattern() { InStorageType bits{0}; for (InStorageType i = 0; i < sizeof(InStorageType) / 2; ++i) { - bits = (bits << 2) + static_cast<uint16_t>(LIBC_NAMESPACE::rand()); + bits = static_cast<InStorageType>( + (bits << 2) + static_cast<uint16_t>(LIBC_NAMESPACE::rand())); } return bits; } @@ -57,7 +58,7 @@ public: using FmaFunc = OutType (*)(InType, InType, InType); void test_subnormal_range(FmaFunc func) { - constexpr InStorageType COUNT = 100'001; + constexpr InStorageType COUNT = 10'001; constexpr InStorageType RAW_STEP = (IN_MAX_SUBNORMAL_U - IN_MIN_SUBNORMAL_U) / COUNT; constexpr InStorageType STEP = (RAW_STEP == 0 ? 1 : RAW_STEP); @@ -75,7 +76,7 @@ public: } void test_normal_range(FmaFunc func) { - constexpr InStorageType COUNT = 100'001; + constexpr InStorageType COUNT = 10'001; constexpr InStorageType RAW_STEP = (IN_MAX_NORMAL_U - IN_MIN_NORMAL_U) / COUNT; constexpr InStorageType STEP = (RAW_STEP == 0 ? 1 : RAW_STEP); diff --git a/libc/test/src/math/HypotTest.h b/libc/test/src/math/HypotTest.h index dc73581..b37abf7 100644 --- a/libc/test/src/math/HypotTest.h +++ b/libc/test/src/math/HypotTest.h @@ -71,8 +71,9 @@ public: void test_subnormal_range(Func func) { constexpr StorageType COUNT = 10'001; - for (unsigned scale = 0; scale < 4; ++scale) { - StorageType max_value = MAX_SUBNORMAL << scale; + constexpr unsigned SCALE = (sizeof(T) < 4) ? 1 : 4; + for (unsigned scale = 0; scale < SCALE; ++scale) { + StorageType max_value = static_cast<StorageType>(MAX_SUBNORMAL << scale); StorageType step = (max_value - MIN_SUBNORMAL) / COUNT + 1; for (int signs = 0; signs < 4; ++signs) { for (StorageType v = MIN_SUBNORMAL, w = max_value; diff --git a/libc/test/src/math/LdExpTest.h b/libc/test/src/math/LdExpTest.h index 08dce0d..cff2aeb 100644 --- a/libc/test/src/math/LdExpTest.h +++ b/libc/test/src/math/LdExpTest.h @@ -17,7 +17,7 @@ #include "test/UnitTest/Test.h" #include "hdr/math_macros.h" -#include <stdint.h> +#include "hdr/stdint_proxy.h" using LIBC_NAMESPACE::Sign; diff --git a/libc/test/src/math/acosf_test.cpp b/libc/test/src/math/acosf_test.cpp index aa0128f..6e2bed7 100644 --- a/libc/test/src/math/acosf_test.cpp +++ b/libc/test/src/math/acosf_test.cpp @@ -7,6 +7,7 @@ //===----------------------------------------------------------------------===// #include "hdr/math_macros.h" +#include "hdr/stdint_proxy.h" #include "src/__support/FPUtil/FPBits.h" #include "src/__support/libc_errno.h" #include "src/math/acosf.h" @@ -14,8 +15,6 @@ #include "test/UnitTest/Test.h" #include "utils/MPFRWrapper/MPFRUtils.h" -#include <stdint.h> - namespace mpfr = LIBC_NAMESPACE::testing::mpfr; using LlvmLibcAcosfTest = LIBC_NAMESPACE::testing::FPTest<float>; diff --git a/libc/test/src/math/acoshf16_test.cpp b/libc/test/src/math/acoshf16_test.cpp index 2eb9521..d190cd1 100644 --- a/libc/test/src/math/acoshf16_test.cpp +++ b/libc/test/src/math/acoshf16_test.cpp @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// +#include "hdr/stdint_proxy.h" #include "src/__support/libc_errno.h" #include "src/math/acoshf16.h" #include "test/UnitTest/FPMatcher.h" #include "test/UnitTest/Test.h" #include "utils/MPFRWrapper/MPFRUtils.h" -#include <stdint.h> using LlvmLibcAcoshf16Test = LIBC_NAMESPACE::testing::FPTest<float16>; namespace mpfr = LIBC_NAMESPACE::testing::mpfr; diff --git a/libc/test/src/math/acoshf_test.cpp b/libc/test/src/math/acoshf_test.cpp index 3d3b827..3305445 100644 --- a/libc/test/src/math/acoshf_test.cpp +++ b/libc/test/src/math/acoshf_test.cpp @@ -7,6 +7,7 @@ //===----------------------------------------------------------------------===// #include "hdr/math_macros.h" +#include "hdr/stdint_proxy.h" #include "src/__support/FPUtil/FPBits.h" #include "src/__support/libc_errno.h" #include "src/math/acoshf.h" @@ -14,8 +15,6 @@ #include "test/UnitTest/Test.h" #include "utils/MPFRWrapper/MPFRUtils.h" -#include <stdint.h> - using LlvmLibcAcoshfTest = LIBC_NAMESPACE::testing::FPTest<float>; namespace mpfr = LIBC_NAMESPACE::testing::mpfr; diff --git a/libc/test/src/math/asinf_test.cpp b/libc/test/src/math/asinf_test.cpp index 1eaa6b8..f2963f2 100644 --- a/libc/test/src/math/asinf_test.cpp +++ b/libc/test/src/math/asinf_test.cpp @@ -8,6 +8,7 @@ //===----------------------------------------------------------------------===// #include "hdr/math_macros.h" +#include "hdr/stdint_proxy.h" #include "src/__support/FPUtil/FPBits.h" #include "src/__support/libc_errno.h" #include "src/math/asinf.h" @@ -15,8 +16,6 @@ #include "test/UnitTest/Test.h" #include "utils/MPFRWrapper/MPFRUtils.h" -#include <stdint.h> - using LlvmLibcAsinfTest = LIBC_NAMESPACE::testing::FPTest<float>; namespace mpfr = LIBC_NAMESPACE::testing::mpfr; diff --git a/libc/test/src/math/asinhf_test.cpp b/libc/test/src/math/asinhf_test.cpp index 8c78f93..f9dfb0a 100644 --- a/libc/test/src/math/asinhf_test.cpp +++ b/libc/test/src/math/asinhf_test.cpp @@ -7,6 +7,7 @@ //===----------------------------------------------------------------------===// #include "hdr/math_macros.h" +#include "hdr/stdint_proxy.h" #include "src/__support/FPUtil/FPBits.h" #include "src/__support/libc_errno.h" #include "src/math/asinhf.h" @@ -14,8 +15,6 @@ #include "test/UnitTest/Test.h" #include "utils/MPFRWrapper/MPFRUtils.h" -#include <stdint.h> - using LlvmLibcAsinhfTest = LIBC_NAMESPACE::testing::FPTest<float>; namespace mpfr = LIBC_NAMESPACE::testing::mpfr; diff --git a/libc/test/src/math/atanf_test.cpp b/libc/test/src/math/atanf_test.cpp index a4bdf18..dc489fe 100644 --- a/libc/test/src/math/atanf_test.cpp +++ b/libc/test/src/math/atanf_test.cpp @@ -7,6 +7,7 @@ //===----------------------------------------------------------------------===// #include "hdr/math_macros.h" +#include "hdr/stdint_proxy.h" #include "src/__support/FPUtil/FPBits.h" #include "src/__support/libc_errno.h" #include "src/math/atanf.h" @@ -14,8 +15,6 @@ #include "test/UnitTest/Test.h" #include "utils/MPFRWrapper/MPFRUtils.h" -#include <stdint.h> - using LlvmLibcAtanfTest = LIBC_NAMESPACE::testing::FPTest<float>; namespace mpfr = LIBC_NAMESPACE::testing::mpfr; diff --git a/libc/test/src/math/atanhf16_test.cpp b/libc/test/src/math/atanhf16_test.cpp index e35cc77..4c35304 100644 --- a/libc/test/src/math/atanhf16_test.cpp +++ b/libc/test/src/math/atanhf16_test.cpp @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// +#include "hdr/stdint_proxy.h" #include "src/math/atanhf16.h" #include "test/UnitTest/FPMatcher.h" #include "test/UnitTest/Test.h" #include "utils/MPFRWrapper/MPFRUtils.h" -#include <stdint.h> using LlvmLibcAtanhf16Test = LIBC_NAMESPACE::testing::FPTest<float16>; namespace mpfr = LIBC_NAMESPACE::testing::mpfr; diff --git a/libc/test/src/math/atanhf_test.cpp b/libc/test/src/math/atanhf_test.cpp index 32272ef..1ec7b6b 100644 --- a/libc/test/src/math/atanhf_test.cpp +++ b/libc/test/src/math/atanhf_test.cpp @@ -7,6 +7,7 @@ //===----------------------------------------------------------------------===// #include "hdr/math_macros.h" +#include "hdr/stdint_proxy.h" #include "src/__support/FPUtil/FPBits.h" #include "src/__support/libc_errno.h" #include "src/math/atanhf.h" @@ -14,8 +15,6 @@ #include "test/UnitTest/Test.h" #include "utils/MPFRWrapper/MPFRUtils.h" -#include <stdint.h> - using LlvmLibcAtanhfTest = LIBC_NAMESPACE::testing::FPTest<float>; using LIBC_NAMESPACE::Sign; diff --git a/libc/test/src/math/cosf_test.cpp b/libc/test/src/math/cosf_test.cpp index 90dc8ff..e2b444f 100644 --- a/libc/test/src/math/cosf_test.cpp +++ b/libc/test/src/math/cosf_test.cpp @@ -7,6 +7,7 @@ //===----------------------------------------------------------------------===// #include "hdr/math_macros.h" +#include "hdr/stdint_proxy.h" #include "src/__support/FPUtil/FPBits.h" #include "src/__support/libc_errno.h" #include "src/math/cosf.h" @@ -15,8 +16,6 @@ #include "test/src/math/sdcomp26094.h" #include "utils/MPFRWrapper/MPFRUtils.h" -#include <stdint.h> - using LIBC_NAMESPACE::testing::SDCOMP26094_VALUES; using LlvmLibcCosfTest = LIBC_NAMESPACE::testing::FPTest<float>; diff --git a/libc/test/src/math/coshf_test.cpp b/libc/test/src/math/coshf_test.cpp index bdaba50..98f9a82 100644 --- a/libc/test/src/math/coshf_test.cpp +++ b/libc/test/src/math/coshf_test.cpp @@ -7,6 +7,7 @@ //===----------------------------------------------------------------------===// #include "hdr/math_macros.h" +#include "hdr/stdint_proxy.h" #include "src/__support/CPP/array.h" #include "src/__support/FPUtil/FPBits.h" #include "src/__support/libc_errno.h" @@ -15,8 +16,6 @@ #include "test/UnitTest/Test.h" #include "utils/MPFRWrapper/MPFRUtils.h" -#include <stdint.h> - using LlvmLibcCoshfTest = LIBC_NAMESPACE::testing::FPTest<float>; namespace mpfr = LIBC_NAMESPACE::testing::mpfr; diff --git a/libc/test/src/math/erff_test.cpp b/libc/test/src/math/erff_test.cpp index f9b0337..c40aacf 100644 --- a/libc/test/src/math/erff_test.cpp +++ b/libc/test/src/math/erff_test.cpp @@ -13,7 +13,7 @@ #include "test/UnitTest/Test.h" #include "utils/MPFRWrapper/MPFRUtils.h" -#include <stdint.h> +#include "hdr/stdint_proxy.h" using LlvmLibcErffTest = LIBC_NAMESPACE::testing::FPTest<float>; diff --git a/libc/test/src/math/exp10_test.cpp b/libc/test/src/math/exp10_test.cpp index 6126e5f2..ee8fe9b 100644 --- a/libc/test/src/math/exp10_test.cpp +++ b/libc/test/src/math/exp10_test.cpp @@ -14,7 +14,7 @@ #include "test/UnitTest/Test.h" #include "utils/MPFRWrapper/MPFRUtils.h" -#include <stdint.h> +#include "hdr/stdint_proxy.h" using LlvmLibcExp10Test = LIBC_NAMESPACE::testing::FPTest<double>; diff --git a/libc/test/src/math/exp10f_test.cpp b/libc/test/src/math/exp10f_test.cpp index 8991596..e2021423 100644 --- a/libc/test/src/math/exp10f_test.cpp +++ b/libc/test/src/math/exp10f_test.cpp @@ -14,7 +14,7 @@ #include "test/UnitTest/Test.h" #include "utils/MPFRWrapper/MPFRUtils.h" -#include <stdint.h> +#include "hdr/stdint_proxy.h" using LlvmLibcExp10fTest = LIBC_NAMESPACE::testing::FPTest<float>; diff --git a/libc/test/src/math/exp10m1f_test.cpp b/libc/test/src/math/exp10m1f_test.cpp index 01802bd..613fdeb 100644 --- a/libc/test/src/math/exp10m1f_test.cpp +++ b/libc/test/src/math/exp10m1f_test.cpp @@ -14,7 +14,7 @@ #include "test/UnitTest/Test.h" #include "utils/MPFRWrapper/MPFRUtils.h" -#include <stdint.h> +#include "hdr/stdint_proxy.h" using LlvmLibcExp10m1fTest = LIBC_NAMESPACE::testing::FPTest<float>; diff --git a/libc/test/src/math/exp2_test.cpp b/libc/test/src/math/exp2_test.cpp index 4cd95dd..7866037 100644 --- a/libc/test/src/math/exp2_test.cpp +++ b/libc/test/src/math/exp2_test.cpp @@ -14,7 +14,7 @@ #include "test/UnitTest/Test.h" #include "utils/MPFRWrapper/MPFRUtils.h" -#include <stdint.h> +#include "hdr/stdint_proxy.h" using LlvmLibcExp2Test = LIBC_NAMESPACE::testing::FPTest<double>; diff --git a/libc/test/src/math/exp2f_test.cpp b/libc/test/src/math/exp2f_test.cpp index aeecb3e..349a4c3 100644 --- a/libc/test/src/math/exp2f_test.cpp +++ b/libc/test/src/math/exp2f_test.cpp @@ -14,7 +14,7 @@ #include "test/UnitTest/Test.h" #include "utils/MPFRWrapper/MPFRUtils.h" -#include <stdint.h> +#include "hdr/stdint_proxy.h" using LlvmLibcExp2fTest = LIBC_NAMESPACE::testing::FPTest<float>; diff --git a/libc/test/src/math/exp2m1f_test.cpp b/libc/test/src/math/exp2m1f_test.cpp index 0c87657..a323bdc 100644 --- a/libc/test/src/math/exp2m1f_test.cpp +++ b/libc/test/src/math/exp2m1f_test.cpp @@ -15,7 +15,7 @@ #include "test/UnitTest/Test.h" #include "utils/MPFRWrapper/MPFRUtils.h" -#include <stdint.h> +#include "hdr/stdint_proxy.h" using LlvmLibcExp2m1fTest = LIBC_NAMESPACE::testing::FPTest<float>; diff --git a/libc/test/src/math/exp_test.cpp b/libc/test/src/math/exp_test.cpp index 83addae..d328d09 100644 --- a/libc/test/src/math/exp_test.cpp +++ b/libc/test/src/math/exp_test.cpp @@ -14,7 +14,7 @@ #include "test/UnitTest/Test.h" #include "utils/MPFRWrapper/MPFRUtils.h" -#include <stdint.h> +#include "hdr/stdint_proxy.h" using LlvmLibcExpTest = LIBC_NAMESPACE::testing::FPTest<double>; diff --git a/libc/test/src/math/expf_test.cpp b/libc/test/src/math/expf_test.cpp index 3c10812f..8329d74 100644 --- a/libc/test/src/math/expf_test.cpp +++ b/libc/test/src/math/expf_test.cpp @@ -14,7 +14,7 @@ #include "test/UnitTest/Test.h" #include "utils/MPFRWrapper/MPFRUtils.h" -#include <stdint.h> +#include "hdr/stdint_proxy.h" using LlvmLibcExpfTest = LIBC_NAMESPACE::testing::FPTest<float>; diff --git a/libc/test/src/math/expm1_test.cpp b/libc/test/src/math/expm1_test.cpp index 0cf07e2..5d546de 100644 --- a/libc/test/src/math/expm1_test.cpp +++ b/libc/test/src/math/expm1_test.cpp @@ -14,7 +14,7 @@ #include "test/UnitTest/Test.h" #include "utils/MPFRWrapper/MPFRUtils.h" -#include <stdint.h> +#include "hdr/stdint_proxy.h" using LlvmLibcExpm1Test = LIBC_NAMESPACE::testing::FPTest<double>; diff --git a/libc/test/src/math/expm1f_test.cpp b/libc/test/src/math/expm1f_test.cpp index cf3fe9c..d5c98be 100644 --- a/libc/test/src/math/expm1f_test.cpp +++ b/libc/test/src/math/expm1f_test.cpp @@ -14,7 +14,7 @@ #include "test/UnitTest/Test.h" #include "utils/MPFRWrapper/MPFRUtils.h" -#include <stdint.h> +#include "hdr/stdint_proxy.h" using LlvmLibcExpm1fTest = LIBC_NAMESPACE::testing::FPTest<float>; diff --git a/libc/test/src/math/in_float_range_test_helper.h b/libc/test/src/math/in_float_range_test_helper.h index 35e039e..2179182 100644 --- a/libc/test/src/math/in_float_range_test_helper.h +++ b/libc/test/src/math/in_float_range_test_helper.h @@ -5,7 +5,7 @@ #ifndef LLVM_LIBC_TEST_SRC_MATH_IN_FLOAT_RANGE_TEST_HELPER_H #define LLVM_LIBC_TEST_SRC_MATH_IN_FLOAT_RANGE_TEST_HELPER_H -#include <stdint.h> +#include "hdr/stdint_proxy.h" #define CHECK_DATA(start, stop, mfp_op, f, f_check, count, prec) \ { \ diff --git a/libc/test/src/math/log10_test.cpp b/libc/test/src/math/log10_test.cpp index e9529d8..7d087d4e 100644 --- a/libc/test/src/math/log10_test.cpp +++ b/libc/test/src/math/log10_test.cpp @@ -14,7 +14,7 @@ #include "test/UnitTest/Test.h" #include "utils/MPFRWrapper/MPFRUtils.h" -#include <stdint.h> +#include "hdr/stdint_proxy.h" using LlvmLibcLog10Test = LIBC_NAMESPACE::testing::FPTest<double>; diff --git a/libc/test/src/math/log10f_test.cpp b/libc/test/src/math/log10f_test.cpp index b2c1c28..c554948 100644 --- a/libc/test/src/math/log10f_test.cpp +++ b/libc/test/src/math/log10f_test.cpp @@ -13,7 +13,7 @@ #include "test/UnitTest/Test.h" #include "utils/MPFRWrapper/MPFRUtils.h" -#include <stdint.h> +#include "hdr/stdint_proxy.h" using LlvmLibcLog10fTest = LIBC_NAMESPACE::testing::FPTest<float>; diff --git a/libc/test/src/math/log1p_test.cpp b/libc/test/src/math/log1p_test.cpp index e5747b7..4d1efe7 100644 --- a/libc/test/src/math/log1p_test.cpp +++ b/libc/test/src/math/log1p_test.cpp @@ -14,7 +14,7 @@ #include "test/UnitTest/Test.h" #include "utils/MPFRWrapper/MPFRUtils.h" -#include <stdint.h> +#include "hdr/stdint_proxy.h" using LlvmLibcLog1pTest = LIBC_NAMESPACE::testing::FPTest<double>; diff --git a/libc/test/src/math/log1pf_test.cpp b/libc/test/src/math/log1pf_test.cpp index ffe2dd2..0badbeb 100644 --- a/libc/test/src/math/log1pf_test.cpp +++ b/libc/test/src/math/log1pf_test.cpp @@ -14,7 +14,7 @@ #include "test/UnitTest/Test.h" #include "utils/MPFRWrapper/MPFRUtils.h" -#include <stdint.h> +#include "hdr/stdint_proxy.h" using LlvmLibcLog1pfTest = LIBC_NAMESPACE::testing::FPTest<float>; diff --git a/libc/test/src/math/log2_test.cpp b/libc/test/src/math/log2_test.cpp index fc440c0..dd55bd8 100644 --- a/libc/test/src/math/log2_test.cpp +++ b/libc/test/src/math/log2_test.cpp @@ -14,7 +14,7 @@ #include "test/UnitTest/Test.h" #include "utils/MPFRWrapper/MPFRUtils.h" -#include <stdint.h> +#include "hdr/stdint_proxy.h" using LlvmLibcLog2Test = LIBC_NAMESPACE::testing::FPTest<double>; diff --git a/libc/test/src/math/log2f_test.cpp b/libc/test/src/math/log2f_test.cpp index 92226c7..7854489 100644 --- a/libc/test/src/math/log2f_test.cpp +++ b/libc/test/src/math/log2f_test.cpp @@ -14,7 +14,7 @@ #include "test/UnitTest/Test.h" #include "utils/MPFRWrapper/MPFRUtils.h" -#include <stdint.h> +#include "hdr/stdint_proxy.h" using LlvmLibcLog2fTest = LIBC_NAMESPACE::testing::FPTest<float>; diff --git a/libc/test/src/math/log_test.cpp b/libc/test/src/math/log_test.cpp index 54afaa3..be156fe 100644 --- a/libc/test/src/math/log_test.cpp +++ b/libc/test/src/math/log_test.cpp @@ -14,7 +14,7 @@ #include "test/UnitTest/Test.h" #include "utils/MPFRWrapper/MPFRUtils.h" -#include <stdint.h> +#include "hdr/stdint_proxy.h" using LlvmLibcLogTest = LIBC_NAMESPACE::testing::FPTest<double>; diff --git a/libc/test/src/math/logf_test.cpp b/libc/test/src/math/logf_test.cpp index 79d8275..7658075 100644 --- a/libc/test/src/math/logf_test.cpp +++ b/libc/test/src/math/logf_test.cpp @@ -13,7 +13,7 @@ #include "test/UnitTest/Test.h" #include "utils/MPFRWrapper/MPFRUtils.h" -#include <stdint.h> +#include "hdr/stdint_proxy.h" using LlvmLibcLogfTest = LIBC_NAMESPACE::testing::FPTest<float>; diff --git a/libc/test/src/math/performance_testing/Timer.h b/libc/test/src/math/performance_testing/Timer.h index 32578ad..f75c1f0 100644 --- a/libc/test/src/math/performance_testing/Timer.h +++ b/libc/test/src/math/performance_testing/Timer.h @@ -9,8 +9,8 @@ #ifndef LLVM_LIBC_TEST_SRC_MATH_PERFORMACE_TESTING_TIMER_H #define LLVM_LIBC_TEST_SRC_MATH_PERFORMACE_TESTING_TIMER_H +#include "hdr/stdint_proxy.h" #include "src/__support/macros/config.h" -#include <stdint.h> namespace LIBC_NAMESPACE_DECL { namespace testing { diff --git a/libc/test/src/math/performance_testing/fmodf16_perf.cpp b/libc/test/src/math/performance_testing/fmodf16_perf.cpp index f7c492c..407ed7c 100644 --- a/libc/test/src/math/performance_testing/fmodf16_perf.cpp +++ b/libc/test/src/math/performance_testing/fmodf16_perf.cpp @@ -11,7 +11,7 @@ #include "src/__support/FPUtil/generic/FMod.h" #include "src/__support/macros/properties/types.h" -#include <stdint.h> +#include "hdr/stdint_proxy.h" #define FMOD_FUNC(U) (LIBC_NAMESPACE::fputil::generic::FMod<float16, U>::eval) diff --git a/libc/test/src/math/powf_test.cpp b/libc/test/src/math/powf_test.cpp index 4d189d8..1d70724 100644 --- a/libc/test/src/math/powf_test.cpp +++ b/libc/test/src/math/powf_test.cpp @@ -13,7 +13,7 @@ #include "test/UnitTest/Test.h" #include "utils/MPFRWrapper/MPFRUtils.h" -#include <stdint.h> +#include "hdr/stdint_proxy.h" using LlvmLibcPowfTest = LIBC_NAMESPACE::testing::FPTest<float>; using LIBC_NAMESPACE::testing::tlog; diff --git a/libc/test/src/math/sdcomp26094.h b/libc/test/src/math/sdcomp26094.h index bb2b9f1..b08cfd2 100644 --- a/libc/test/src/math/sdcomp26094.h +++ b/libc/test/src/math/sdcomp26094.h @@ -9,11 +9,10 @@ #ifndef LLVM_LIBC_TEST_SRC_MATH_SDCOMP26094_H #define LLVM_LIBC_TEST_SRC_MATH_SDCOMP26094_H +#include "hdr/stdint_proxy.h" #include "src/__support/CPP/array.h" #include "src/__support/macros/config.h" -#include <stdint.h> - namespace LIBC_NAMESPACE_DECL { namespace testing { diff --git a/libc/test/src/math/sincosf_test.cpp b/libc/test/src/math/sincosf_test.cpp index 4aac1fa..9c2656f 100644 --- a/libc/test/src/math/sincosf_test.cpp +++ b/libc/test/src/math/sincosf_test.cpp @@ -15,7 +15,7 @@ #include "test/src/math/sdcomp26094.h" #include "utils/MPFRWrapper/MPFRUtils.h" -#include <stdint.h> +#include "hdr/stdint_proxy.h" using LlvmLibcSinCosfTest = LIBC_NAMESPACE::testing::FPTest<float>; diff --git a/libc/test/src/math/sinf_test.cpp b/libc/test/src/math/sinf_test.cpp index e0357e6..c4676d9 100644 --- a/libc/test/src/math/sinf_test.cpp +++ b/libc/test/src/math/sinf_test.cpp @@ -15,7 +15,7 @@ #include "test/src/math/sdcomp26094.h" #include "utils/MPFRWrapper/MPFRUtils.h" -#include <stdint.h> +#include "hdr/stdint_proxy.h" using LlvmLibcSinfTest = LIBC_NAMESPACE::testing::FPTest<float>; diff --git a/libc/test/src/math/sinhf_test.cpp b/libc/test/src/math/sinhf_test.cpp index 74f906e..a664010 100644 --- a/libc/test/src/math/sinhf_test.cpp +++ b/libc/test/src/math/sinhf_test.cpp @@ -15,7 +15,7 @@ #include "test/UnitTest/Test.h" #include "utils/MPFRWrapper/MPFRUtils.h" -#include <stdint.h> +#include "hdr/stdint_proxy.h" using LlvmLibcSinhfTest = LIBC_NAMESPACE::testing::FPTest<float>; diff --git a/libc/test/src/math/sinpif_test.cpp b/libc/test/src/math/sinpif_test.cpp index 94e3dbc..2e66ae9 100644 --- a/libc/test/src/math/sinpif_test.cpp +++ b/libc/test/src/math/sinpif_test.cpp @@ -12,7 +12,7 @@ #include "test/src/math/sdcomp26094.h" #include "utils/MPFRWrapper/MPFRUtils.h" -#include <stdint.h> +#include "hdr/stdint_proxy.h" using LlvmLibcSinpifTest = LIBC_NAMESPACE::testing::FPTest<float>; diff --git a/libc/test/src/math/smoke/CMakeLists.txt b/libc/test/src/math/smoke/CMakeLists.txt index 4aafe03..ec4c09c 100644 --- a/libc/test/src/math/smoke/CMakeLists.txt +++ b/libc/test/src/math/smoke/CMakeLists.txt @@ -3169,7 +3169,6 @@ add_fp_unittest( libc.hdr.signal_macros libc.src.math.nanf libc.src.__support.FPUtil.fp_bits - libc.src.__support.macros.sanitizer # FIXME: The nan tests currently have death tests, which aren't supported for # hermetic tests. UNIT_TEST_ONLY @@ -3185,7 +3184,6 @@ add_fp_unittest( libc.hdr.signal_macros libc.src.math.nan libc.src.__support.FPUtil.fp_bits - libc.src.__support.macros.sanitizer # FIXME: The nan tests currently have death tests, which aren't supported for # hermetic tests. UNIT_TEST_ONLY @@ -3201,7 +3199,6 @@ add_fp_unittest( libc.hdr.signal_macros libc.src.math.nanl libc.src.__support.FPUtil.fp_bits - libc.src.__support.macros.sanitizer # FIXME: The nan tests currently have death tests, which aren't supported for # hermetic tests. UNIT_TEST_ONLY @@ -3217,7 +3214,6 @@ add_fp_unittest( libc.hdr.signal_macros libc.src.math.nanf16 libc.src.__support.FPUtil.fp_bits - libc.src.__support.macros.sanitizer # FIXME: The nan tests currently have death tests, which aren't supported for # hermetic tests. UNIT_TEST_ONLY @@ -3233,7 +3229,6 @@ add_fp_unittest( libc.hdr.signal_macros libc.src.math.nanf128 libc.src.__support.FPUtil.fp_bits - libc.src.__support.macros.sanitizer # FIXME: The nan tests currently have death tests, which aren't supported for # hermetic tests. UNIT_TEST_ONLY diff --git a/libc/test/src/math/smoke/LdExpTest.h b/libc/test/src/math/smoke/LdExpTest.h index 094cc7e..8de70ad 100644 --- a/libc/test/src/math/smoke/LdExpTest.h +++ b/libc/test/src/math/smoke/LdExpTest.h @@ -9,6 +9,7 @@ #ifndef LLVM_LIBC_TEST_SRC_MATH_LDEXPTEST_H #define LLVM_LIBC_TEST_SRC_MATH_LDEXPTEST_H +#include "hdr/stdint_proxy.h" #include "src/__support/CPP/limits.h" // INT_MAX #include "src/__support/FPUtil/FPBits.h" #include "src/__support/FPUtil/NormalFloat.h" @@ -16,8 +17,6 @@ #include "test/UnitTest/FPMatcher.h" #include "test/UnitTest/Test.h" -#include <stdint.h> - using LIBC_NAMESPACE::Sign; template <typename T, typename U = int> diff --git a/libc/test/src/math/smoke/acosf_test.cpp b/libc/test/src/math/smoke/acosf_test.cpp index 257c6a3..733610a 100644 --- a/libc/test/src/math/smoke/acosf_test.cpp +++ b/libc/test/src/math/smoke/acosf_test.cpp @@ -13,7 +13,7 @@ #include "test/UnitTest/FPMatcher.h" #include "test/UnitTest/Test.h" -#include <stdint.h> +#include "hdr/stdint_proxy.h" using LlvmLibcAcosfTest = LIBC_NAMESPACE::testing::FPTest<float>; diff --git a/libc/test/src/math/smoke/acoshf_test.cpp b/libc/test/src/math/smoke/acoshf_test.cpp index b6abfab..19556b2 100644 --- a/libc/test/src/math/smoke/acoshf_test.cpp +++ b/libc/test/src/math/smoke/acoshf_test.cpp @@ -13,7 +13,7 @@ #include "test/UnitTest/FPMatcher.h" #include "test/UnitTest/Test.h" -#include <stdint.h> +#include "hdr/stdint_proxy.h" using LlvmLibcAcoshfTest = LIBC_NAMESPACE::testing::FPTest<float>; diff --git a/libc/test/src/math/smoke/asinf_test.cpp b/libc/test/src/math/smoke/asinf_test.cpp index 2615a8d..6195a11 100644 --- a/libc/test/src/math/smoke/asinf_test.cpp +++ b/libc/test/src/math/smoke/asinf_test.cpp @@ -13,7 +13,7 @@ #include "test/UnitTest/FPMatcher.h" #include "test/UnitTest/Test.h" -#include <stdint.h> +#include "hdr/stdint_proxy.h" using LlvmLibcAsinfTest = LIBC_NAMESPACE::testing::FPTest<float>; diff --git a/libc/test/src/math/smoke/asinhf_test.cpp b/libc/test/src/math/smoke/asinhf_test.cpp index d812a2d..e6326c1 100644 --- a/libc/test/src/math/smoke/asinhf_test.cpp +++ b/libc/test/src/math/smoke/asinhf_test.cpp @@ -13,7 +13,7 @@ #include "test/UnitTest/FPMatcher.h" #include "test/UnitTest/Test.h" -#include <stdint.h> +#include "hdr/stdint_proxy.h" using LlvmLibcAsinhfTest = LIBC_NAMESPACE::testing::FPTest<float>; diff --git a/libc/test/src/math/smoke/atanf_test.cpp b/libc/test/src/math/smoke/atanf_test.cpp index b56b9d0..7d2dfee 100644 --- a/libc/test/src/math/smoke/atanf_test.cpp +++ b/libc/test/src/math/smoke/atanf_test.cpp @@ -13,7 +13,7 @@ #include "test/UnitTest/FPMatcher.h" #include "test/UnitTest/Test.h" -#include <stdint.h> +#include "hdr/stdint_proxy.h" using LlvmLibcAtanfTest = LIBC_NAMESPACE::testing::FPTest<float>; diff --git a/libc/test/src/math/smoke/atanhf_test.cpp b/libc/test/src/math/smoke/atanhf_test.cpp index 038cb30..5588ae0 100644 --- a/libc/test/src/math/smoke/atanhf_test.cpp +++ b/libc/test/src/math/smoke/atanhf_test.cpp @@ -13,7 +13,7 @@ #include "test/UnitTest/FPMatcher.h" #include "test/UnitTest/Test.h" -#include <stdint.h> +#include "hdr/stdint_proxy.h" using LIBC_NAMESPACE::Sign; diff --git a/libc/test/src/math/smoke/cosf_test.cpp b/libc/test/src/math/smoke/cosf_test.cpp index 470a876..837fee9 100644 --- a/libc/test/src/math/smoke/cosf_test.cpp +++ b/libc/test/src/math/smoke/cosf_test.cpp @@ -7,14 +7,13 @@ //===----------------------------------------------------------------------===// #include "hdr/math_macros.h" +#include "hdr/stdint_proxy.h" #include "src/__support/FPUtil/FPBits.h" #include "src/__support/libc_errno.h" #include "src/math/cosf.h" #include "test/UnitTest/FPMatcher.h" #include "test/UnitTest/Test.h" -#include <stdint.h> - using LlvmLibcCosfTest = LIBC_NAMESPACE::testing::FPTest<float>; TEST_F(LlvmLibcCosfTest, SpecialNumbers) { diff --git a/libc/test/src/math/smoke/coshf_test.cpp b/libc/test/src/math/smoke/coshf_test.cpp index ee8f019..81096fa 100644 --- a/libc/test/src/math/smoke/coshf_test.cpp +++ b/libc/test/src/math/smoke/coshf_test.cpp @@ -7,6 +7,7 @@ //===----------------------------------------------------------------------===// #include "hdr/math_macros.h" +#include "hdr/stdint_proxy.h" #include "src/__support/CPP/array.h" #include "src/__support/FPUtil/FPBits.h" #include "src/__support/libc_errno.h" @@ -14,8 +15,6 @@ #include "test/UnitTest/FPMatcher.h" #include "test/UnitTest/Test.h" -#include <stdint.h> - using LlvmLibcCoshfTest = LIBC_NAMESPACE::testing::FPTest<float>; TEST_F(LlvmLibcCoshfTest, SpecialNumbers) { diff --git a/libc/test/src/math/smoke/cospif_test.cpp b/libc/test/src/math/smoke/cospif_test.cpp index 3d48909..6f1bb24 100644 --- a/libc/test/src/math/smoke/cospif_test.cpp +++ b/libc/test/src/math/smoke/cospif_test.cpp @@ -6,12 +6,11 @@ // //===----------------------------------------------------------------------===// +#include "hdr/stdint_proxy.h" #include "src/__support/libc_errno.h" #include "src/math/cospif.h" #include "test/UnitTest/FPMatcher.h" -#include <stdint.h> - using LlvmLibcCospifTest = LIBC_NAMESPACE::testing::FPTest<float>; TEST_F(LlvmLibcCospifTest, SpecialNumbers) { diff --git a/libc/test/src/math/smoke/erff_test.cpp b/libc/test/src/math/smoke/erff_test.cpp index a9f4994..133b4b8 100644 --- a/libc/test/src/math/smoke/erff_test.cpp +++ b/libc/test/src/math/smoke/erff_test.cpp @@ -7,13 +7,12 @@ //===----------------------------------------------------------------------===// #include "hdr/math_macros.h" +#include "hdr/stdint_proxy.h" #include "src/__support/FPUtil/FPBits.h" #include "src/math/erff.h" #include "test/UnitTest/FPMatcher.h" #include "test/UnitTest/Test.h" -#include <stdint.h> - using LlvmLibcErffTest = LIBC_NAMESPACE::testing::FPTest<float>; TEST_F(LlvmLibcErffTest, SpecialNumbers) { diff --git a/libc/test/src/math/smoke/exp10_test.cpp b/libc/test/src/math/smoke/exp10_test.cpp index 50d3de0..76e6c78 100644 --- a/libc/test/src/math/smoke/exp10_test.cpp +++ b/libc/test/src/math/smoke/exp10_test.cpp @@ -7,14 +7,13 @@ //===----------------------------------------------------------------------===// #include "hdr/math_macros.h" +#include "hdr/stdint_proxy.h" #include "src/__support/FPUtil/FPBits.h" #include "src/__support/libc_errno.h" #include "src/math/exp10.h" #include "test/UnitTest/FPMatcher.h" #include "test/UnitTest/Test.h" -#include <stdint.h> - using LlvmLibcExp10Test = LIBC_NAMESPACE::testing::FPTest<double>; TEST_F(LlvmLibcExp10Test, SpecialNumbers) { diff --git a/libc/test/src/math/smoke/exp10f_test.cpp b/libc/test/src/math/smoke/exp10f_test.cpp index fcd334b..cf2f976 100644 --- a/libc/test/src/math/smoke/exp10f_test.cpp +++ b/libc/test/src/math/smoke/exp10f_test.cpp @@ -7,14 +7,13 @@ //===----------------------------------------------------------------------===// #include "hdr/math_macros.h" +#include "hdr/stdint_proxy.h" #include "src/__support/FPUtil/FPBits.h" #include "src/__support/libc_errno.h" #include "src/math/exp10f.h" #include "test/UnitTest/FPMatcher.h" #include "test/UnitTest/Test.h" -#include <stdint.h> - using LlvmLibcExp10fTest = LIBC_NAMESPACE::testing::FPTest<float>; TEST_F(LlvmLibcExp10fTest, SpecialNumbers) { diff --git a/libc/test/src/math/smoke/exp2_test.cpp b/libc/test/src/math/smoke/exp2_test.cpp index aebf808..3d26df1 100644 --- a/libc/test/src/math/smoke/exp2_test.cpp +++ b/libc/test/src/math/smoke/exp2_test.cpp @@ -7,14 +7,13 @@ //===----------------------------------------------------------------------===// #include "hdr/math_macros.h" +#include "hdr/stdint_proxy.h" #include "src/__support/FPUtil/FPBits.h" #include "src/__support/libc_errno.h" #include "src/math/exp2.h" #include "test/UnitTest/FPMatcher.h" #include "test/UnitTest/Test.h" -#include <stdint.h> - using LlvmLibcExp2Test = LIBC_NAMESPACE::testing::FPTest<double>; TEST_F(LlvmLibcExp2Test, SpecialNumbers) { diff --git a/libc/test/src/math/smoke/exp2f_test.cpp b/libc/test/src/math/smoke/exp2f_test.cpp index c524327..12bcbec 100644 --- a/libc/test/src/math/smoke/exp2f_test.cpp +++ b/libc/test/src/math/smoke/exp2f_test.cpp @@ -7,14 +7,13 @@ //===----------------------------------------------------------------------===// #include "hdr/math_macros.h" +#include "hdr/stdint_proxy.h" #include "src/__support/FPUtil/FPBits.h" #include "src/__support/libc_errno.h" #include "src/math/exp2f.h" #include "test/UnitTest/FPMatcher.h" #include "test/UnitTest/Test.h" -#include <stdint.h> - using LlvmLibcExp2fTest = LIBC_NAMESPACE::testing::FPTest<float>; TEST_F(LlvmLibcExp2fTest, SpecialNumbers) { diff --git a/libc/test/src/math/smoke/exp_test.cpp b/libc/test/src/math/smoke/exp_test.cpp index c3b2ae7..4ce3227 100644 --- a/libc/test/src/math/smoke/exp_test.cpp +++ b/libc/test/src/math/smoke/exp_test.cpp @@ -7,14 +7,13 @@ //===----------------------------------------------------------------------===// #include "hdr/math_macros.h" +#include "hdr/stdint_proxy.h" #include "src/__support/FPUtil/FPBits.h" #include "src/__support/libc_errno.h" #include "src/math/exp.h" #include "test/UnitTest/FPMatcher.h" #include "test/UnitTest/Test.h" -#include <stdint.h> - using LlvmLibcExpTest = LIBC_NAMESPACE::testing::FPTest<double>; TEST_F(LlvmLibcExpTest, SpecialNumbers) { diff --git a/libc/test/src/math/smoke/expf_test.cpp b/libc/test/src/math/smoke/expf_test.cpp index d341517..a0e785f 100644 --- a/libc/test/src/math/smoke/expf_test.cpp +++ b/libc/test/src/math/smoke/expf_test.cpp @@ -7,14 +7,13 @@ //===----------------------------------------------------------------------===// #include "hdr/math_macros.h" +#include "hdr/stdint_proxy.h" #include "src/__support/FPUtil/FPBits.h" #include "src/__support/libc_errno.h" #include "src/math/expf.h" #include "test/UnitTest/FPMatcher.h" #include "test/UnitTest/Test.h" -#include <stdint.h> - using LlvmLibcExpfTest = LIBC_NAMESPACE::testing::FPTest<float>; TEST_F(LlvmLibcExpfTest, SpecialNumbers) { diff --git a/libc/test/src/math/smoke/expm1_test.cpp b/libc/test/src/math/smoke/expm1_test.cpp index c842fe3..db7149d 100644 --- a/libc/test/src/math/smoke/expm1_test.cpp +++ b/libc/test/src/math/smoke/expm1_test.cpp @@ -7,14 +7,13 @@ //===----------------------------------------------------------------------===// #include "hdr/math_macros.h" +#include "hdr/stdint_proxy.h" #include "src/__support/FPUtil/FPBits.h" #include "src/__support/libc_errno.h" #include "src/math/expm1.h" #include "test/UnitTest/FPMatcher.h" #include "test/UnitTest/Test.h" -#include <stdint.h> - using LlvmLibcExpm1Test = LIBC_NAMESPACE::testing::FPTest<double>; TEST_F(LlvmLibcExpm1Test, SpecialNumbers) { diff --git a/libc/test/src/math/smoke/expm1f_test.cpp b/libc/test/src/math/smoke/expm1f_test.cpp index 214bfe8..9482bf6f 100644 --- a/libc/test/src/math/smoke/expm1f_test.cpp +++ b/libc/test/src/math/smoke/expm1f_test.cpp @@ -7,14 +7,13 @@ //===----------------------------------------------------------------------===// #include "hdr/math_macros.h" +#include "hdr/stdint_proxy.h" #include "src/__support/FPUtil/FPBits.h" #include "src/__support/libc_errno.h" #include "src/math/expm1f.h" #include "test/UnitTest/FPMatcher.h" #include "test/UnitTest/Test.h" -#include <stdint.h> - using LlvmLibcExpm1fTest = LIBC_NAMESPACE::testing::FPTest<float>; TEST_F(LlvmLibcExpm1fTest, SpecialNumbers) { diff --git a/libc/test/src/math/smoke/log10_test.cpp b/libc/test/src/math/smoke/log10_test.cpp index 49cfda8..3af27d4 100644 --- a/libc/test/src/math/smoke/log10_test.cpp +++ b/libc/test/src/math/smoke/log10_test.cpp @@ -7,14 +7,13 @@ //===----------------------------------------------------------------------===// #include "hdr/math_macros.h" +#include "hdr/stdint_proxy.h" #include "src/__support/FPUtil/FPBits.h" #include "src/__support/libc_errno.h" #include "src/math/log10.h" #include "test/UnitTest/FPMatcher.h" #include "test/UnitTest/Test.h" -#include <stdint.h> - using LlvmLibcLog10Test = LIBC_NAMESPACE::testing::FPTest<double>; TEST_F(LlvmLibcLog10Test, SpecialNumbers) { diff --git a/libc/test/src/math/smoke/log10f_test.cpp b/libc/test/src/math/smoke/log10f_test.cpp index a638221..f15da75 100644 --- a/libc/test/src/math/smoke/log10f_test.cpp +++ b/libc/test/src/math/smoke/log10f_test.cpp @@ -7,13 +7,12 @@ //===----------------------------------------------------------------------===// #include "hdr/math_macros.h" +#include "hdr/stdint_proxy.h" #include "src/__support/FPUtil/FPBits.h" #include "src/math/log10f.h" #include "test/UnitTest/FPMatcher.h" #include "test/UnitTest/Test.h" -#include <stdint.h> - using LlvmLibcLog10fTest = LIBC_NAMESPACE::testing::FPTest<float>; TEST_F(LlvmLibcLog10fTest, SpecialNumbers) { diff --git a/libc/test/src/math/smoke/log1pf_test.cpp b/libc/test/src/math/smoke/log1pf_test.cpp index dc3489f..82c2f94 100644 --- a/libc/test/src/math/smoke/log1pf_test.cpp +++ b/libc/test/src/math/smoke/log1pf_test.cpp @@ -7,14 +7,13 @@ //===----------------------------------------------------------------------===// #include "hdr/math_macros.h" +#include "hdr/stdint_proxy.h" #include "src/__support/FPUtil/FPBits.h" #include "src/__support/libc_errno.h" #include "src/math/log1pf.h" #include "test/UnitTest/FPMatcher.h" #include "test/UnitTest/Test.h" -#include <stdint.h> - using LlvmLibcLog1pfTest = LIBC_NAMESPACE::testing::FPTest<float>; TEST_F(LlvmLibcLog1pfTest, SpecialNumbers) { diff --git a/libc/test/src/math/smoke/log2_test.cpp b/libc/test/src/math/smoke/log2_test.cpp index 0534d00..6bf1ce3 100644 --- a/libc/test/src/math/smoke/log2_test.cpp +++ b/libc/test/src/math/smoke/log2_test.cpp @@ -7,14 +7,13 @@ //===----------------------------------------------------------------------===// #include "hdr/math_macros.h" +#include "hdr/stdint_proxy.h" #include "src/__support/FPUtil/FPBits.h" #include "src/__support/libc_errno.h" #include "src/math/log2.h" #include "test/UnitTest/FPMatcher.h" #include "test/UnitTest/Test.h" -#include <stdint.h> - using LlvmLibcLog2Test = LIBC_NAMESPACE::testing::FPTest<double>; TEST_F(LlvmLibcLog2Test, SpecialNumbers) { diff --git a/libc/test/src/math/smoke/log2f_test.cpp b/libc/test/src/math/smoke/log2f_test.cpp index 53d54ac..80e13a2 100644 --- a/libc/test/src/math/smoke/log2f_test.cpp +++ b/libc/test/src/math/smoke/log2f_test.cpp @@ -7,14 +7,13 @@ //===----------------------------------------------------------------------===// #include "hdr/math_macros.h" +#include "hdr/stdint_proxy.h" #include "src/__support/FPUtil/FPBits.h" #include "src/__support/libc_errno.h" #include "src/math/log2f.h" #include "test/UnitTest/FPMatcher.h" #include "test/UnitTest/Test.h" -#include <stdint.h> - using LlvmLibcLog2fTest = LIBC_NAMESPACE::testing::FPTest<float>; TEST_F(LlvmLibcLog2fTest, SpecialNumbers) { diff --git a/libc/test/src/math/smoke/log_test.cpp b/libc/test/src/math/smoke/log_test.cpp index 09e9ab0..1d7761a 100644 --- a/libc/test/src/math/smoke/log_test.cpp +++ b/libc/test/src/math/smoke/log_test.cpp @@ -7,14 +7,13 @@ //===----------------------------------------------------------------------===// #include "hdr/math_macros.h" +#include "hdr/stdint_proxy.h" #include "src/__support/FPUtil/FPBits.h" #include "src/__support/libc_errno.h" #include "src/math/log.h" #include "test/UnitTest/FPMatcher.h" #include "test/UnitTest/Test.h" -#include <stdint.h> - using LlvmLibcLogTest = LIBC_NAMESPACE::testing::FPTest<double>; TEST_F(LlvmLibcLogTest, SpecialNumbers) { diff --git a/libc/test/src/math/smoke/logf_test.cpp b/libc/test/src/math/smoke/logf_test.cpp index faba50e..f58209e 100644 --- a/libc/test/src/math/smoke/logf_test.cpp +++ b/libc/test/src/math/smoke/logf_test.cpp @@ -7,13 +7,12 @@ //===----------------------------------------------------------------------===// #include "hdr/math_macros.h" +#include "hdr/stdint_proxy.h" #include "src/__support/FPUtil/FPBits.h" #include "src/math/logf.h" #include "test/UnitTest/FPMatcher.h" #include "test/UnitTest/Test.h" -#include <stdint.h> - using LlvmLibcLogfTest = LIBC_NAMESPACE::testing::FPTest<float>; TEST_F(LlvmLibcLogfTest, SpecialNumbers) { diff --git a/libc/test/src/math/smoke/nan_test.cpp b/libc/test/src/math/smoke/nan_test.cpp index e8376c0..9010b74 100644 --- a/libc/test/src/math/smoke/nan_test.cpp +++ b/libc/test/src/math/smoke/nan_test.cpp @@ -8,7 +8,6 @@ #include "hdr/signal_macros.h" #include "src/__support/FPUtil/FPBits.h" -#include "src/__support/macros/sanitizer.h" #include "src/math/nan.h" #include "test/UnitTest/FEnvSafeTest.h" #include "test/UnitTest/FPMatcher.h" @@ -44,8 +43,8 @@ TEST_F(LlvmLibcNanTest, RandomString) { run_test("123 ", 0x7ff8000000000000); } -#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER) +#if defined(LIBC_ADD_NULL_CHECKS) TEST_F(LlvmLibcNanTest, InvalidInput) { EXPECT_DEATH([] { LIBC_NAMESPACE::nan(nullptr); }, WITH_SIGNAL(-1)); } -#endif // LIBC_HAS_ADDRESS_SANITIZER +#endif // LIBC_ADD_NULL_CHECKS diff --git a/libc/test/src/math/smoke/nanf128_test.cpp b/libc/test/src/math/smoke/nanf128_test.cpp index a63ce88..40b347d 100644 --- a/libc/test/src/math/smoke/nanf128_test.cpp +++ b/libc/test/src/math/smoke/nanf128_test.cpp @@ -8,7 +8,6 @@ #include "hdr/signal_macros.h" #include "src/__support/FPUtil/FPBits.h" -#include "src/__support/macros/sanitizer.h" #include "src/__support/uint128.h" #include "src/math/nanf128.h" #include "test/UnitTest/FEnvSafeTest.h" @@ -55,8 +54,8 @@ TEST_F(LlvmLibcNanf128Test, RandomString) { QUIET_NAN); } -#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER) +#if defined(LIBC_ADD_NULL_CHECKS) TEST_F(LlvmLibcNanf128Test, InvalidInput) { EXPECT_DEATH([] { LIBC_NAMESPACE::nanf128(nullptr); }, WITH_SIGNAL(-1)); } -#endif // LIBC_HAS_ADDRESS_SANITIZER +#endif // LIBC_ADD_NULL_CHECKS diff --git a/libc/test/src/math/smoke/nanf16_test.cpp b/libc/test/src/math/smoke/nanf16_test.cpp index 694470b..e05f79c 100644 --- a/libc/test/src/math/smoke/nanf16_test.cpp +++ b/libc/test/src/math/smoke/nanf16_test.cpp @@ -8,7 +8,6 @@ #include "hdr/signal_macros.h" #include "src/__support/FPUtil/FPBits.h" -#include "src/__support/macros/sanitizer.h" #include "src/math/nanf16.h" #include "test/UnitTest/FEnvSafeTest.h" #include "test/UnitTest/FPMatcher.h" @@ -43,8 +42,8 @@ TEST_F(LlvmLibcNanf16Test, RandomString) { run_test("123 ", 0x7e00); } -#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER) +#if defined(LIBC_ADD_NULL_CHECKS) TEST_F(LlvmLibcNanf16Test, InvalidInput) { EXPECT_DEATH([] { LIBC_NAMESPACE::nanf16(nullptr); }, WITH_SIGNAL(-1)); } -#endif // LIBC_HAS_ADDRESS_SANITIZER +#endif // LIBC_ADD_NULL_CHECKS diff --git a/libc/test/src/math/smoke/nanf_test.cpp b/libc/test/src/math/smoke/nanf_test.cpp index cb57f65..c2fef72 100644 --- a/libc/test/src/math/smoke/nanf_test.cpp +++ b/libc/test/src/math/smoke/nanf_test.cpp @@ -8,7 +8,6 @@ #include "hdr/signal_macros.h" #include "src/__support/FPUtil/FPBits.h" -#include "src/__support/macros/sanitizer.h" #include "src/math/nanf.h" #include "test/UnitTest/FEnvSafeTest.h" #include "test/UnitTest/FPMatcher.h" @@ -43,8 +42,8 @@ TEST_F(LlvmLibcNanfTest, RandomString) { run_test("123 ", 0x7fc00000); } -#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER) +#if defined(LIBC_ADD_NULL_CHECKS) TEST_F(LlvmLibcNanfTest, InvalidInput) { EXPECT_DEATH([] { LIBC_NAMESPACE::nanf(nullptr); }, WITH_SIGNAL(-1)); } -#endif // LIBC_HAS_ADDRESS_SANITIZER +#endif // LIBC_ADD_NULL_CHECKS diff --git a/libc/test/src/math/smoke/nanl_test.cpp b/libc/test/src/math/smoke/nanl_test.cpp index 3bcb914..b1d46df 100644 --- a/libc/test/src/math/smoke/nanl_test.cpp +++ b/libc/test/src/math/smoke/nanl_test.cpp @@ -8,7 +8,6 @@ #include "hdr/signal_macros.h" #include "src/__support/FPUtil/FPBits.h" -#include "src/__support/macros/sanitizer.h" #include "src/math/nanl.h" #include "test/UnitTest/FEnvSafeTest.h" #include "test/UnitTest/FPMatcher.h" @@ -71,8 +70,8 @@ TEST_F(LlvmLibcNanlTest, RandomString) { run_test("123 ", expected); } -#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER) +#if defined(LIBC_ADD_NULL_CHECKS) TEST_F(LlvmLibcNanlTest, InvalidInput) { EXPECT_DEATH([] { LIBC_NAMESPACE::nanl(nullptr); }, WITH_SIGNAL(-1)); } -#endif // LIBC_HAS_ADDRESS_SANITIZER +#endif // LIBC_ADD_NULL_CHECKS diff --git a/libc/test/src/math/smoke/powf_test.cpp b/libc/test/src/math/smoke/powf_test.cpp index 0d1a650..76e8e8c 100644 --- a/libc/test/src/math/smoke/powf_test.cpp +++ b/libc/test/src/math/smoke/powf_test.cpp @@ -7,13 +7,12 @@ //===----------------------------------------------------------------------===// #include "hdr/math_macros.h" +#include "hdr/stdint_proxy.h" #include "src/__support/FPUtil/FPBits.h" #include "src/math/powf.h" #include "test/UnitTest/FPMatcher.h" #include "test/UnitTest/Test.h" -#include <stdint.h> - using LlvmLibcPowfTest = LIBC_NAMESPACE::testing::FPTest<float>; using LIBC_NAMESPACE::fputil::testing::ForceRoundingMode; using LIBC_NAMESPACE::fputil::testing::RoundingMode; diff --git a/libc/test/src/math/smoke/sincosf_test.cpp b/libc/test/src/math/smoke/sincosf_test.cpp index 8ba0d04..7ff0ba7 100644 --- a/libc/test/src/math/smoke/sincosf_test.cpp +++ b/libc/test/src/math/smoke/sincosf_test.cpp @@ -7,14 +7,13 @@ //===----------------------------------------------------------------------===// #include "hdr/math_macros.h" +#include "hdr/stdint_proxy.h" #include "src/__support/FPUtil/FPBits.h" #include "src/__support/libc_errno.h" #include "src/math/sincosf.h" #include "test/UnitTest/FPMatcher.h" #include "test/UnitTest/Test.h" -#include <stdint.h> - using LlvmLibcSinCosfTest = LIBC_NAMESPACE::testing::FPTest<float>; TEST_F(LlvmLibcSinCosfTest, SpecialNumbers) { diff --git a/libc/test/src/math/smoke/sinf_test.cpp b/libc/test/src/math/smoke/sinf_test.cpp index 8173969..8ba66ed 100644 --- a/libc/test/src/math/smoke/sinf_test.cpp +++ b/libc/test/src/math/smoke/sinf_test.cpp @@ -7,14 +7,13 @@ //===----------------------------------------------------------------------===// #include "hdr/math_macros.h" +#include "hdr/stdint_proxy.h" #include "src/__support/FPUtil/FPBits.h" #include "src/__support/libc_errno.h" #include "src/math/sinf.h" #include "test/UnitTest/FPMatcher.h" #include "test/UnitTest/Test.h" -#include <stdint.h> - using LlvmLibcSinfTest = LIBC_NAMESPACE::testing::FPTest<float>; TEST_F(LlvmLibcSinfTest, SpecialNumbers) { diff --git a/libc/test/src/math/smoke/sinhf_test.cpp b/libc/test/src/math/smoke/sinhf_test.cpp index ea6a447..5976a1f 100644 --- a/libc/test/src/math/smoke/sinhf_test.cpp +++ b/libc/test/src/math/smoke/sinhf_test.cpp @@ -7,6 +7,7 @@ //===----------------------------------------------------------------------===// #include "hdr/math_macros.h" +#include "hdr/stdint_proxy.h" #include "src/__support/CPP/array.h" #include "src/__support/FPUtil/FPBits.h" #include "src/__support/libc_errno.h" @@ -14,8 +15,6 @@ #include "test/UnitTest/FPMatcher.h" #include "test/UnitTest/Test.h" -#include <stdint.h> - using LlvmLibcSinhfTest = LIBC_NAMESPACE::testing::FPTest<float>; TEST_F(LlvmLibcSinhfTest, SpecialNumbers) { diff --git a/libc/test/src/math/smoke/sinpif_test.cpp b/libc/test/src/math/smoke/sinpif_test.cpp index b840f39..4a725e0 100644 --- a/libc/test/src/math/smoke/sinpif_test.cpp +++ b/libc/test/src/math/smoke/sinpif_test.cpp @@ -6,12 +6,11 @@ // //===----------------------------------------------------------------------===// +#include "hdr/stdint_proxy.h" #include "src/__support/libc_errno.h" #include "src/math/sinpif.h" #include "test/UnitTest/FPMatcher.h" -#include <stdint.h> - using LlvmLibcSinpifTest = LIBC_NAMESPACE::testing::FPTest<float>; TEST_F(LlvmLibcSinpifTest, SpecialNumbers) { diff --git a/libc/test/src/math/smoke/tanf_test.cpp b/libc/test/src/math/smoke/tanf_test.cpp index 12deca5..c85907c 100644 --- a/libc/test/src/math/smoke/tanf_test.cpp +++ b/libc/test/src/math/smoke/tanf_test.cpp @@ -7,14 +7,13 @@ //===----------------------------------------------------------------------===// #include "hdr/math_macros.h" +#include "hdr/stdint_proxy.h" #include "src/__support/FPUtil/FPBits.h" #include "src/__support/libc_errno.h" #include "src/math/tanf.h" #include "test/UnitTest/FPMatcher.h" #include "test/UnitTest/Test.h" -#include <stdint.h> - using LlvmLibcTanfTest = LIBC_NAMESPACE::testing::FPTest<float>; TEST_F(LlvmLibcTanfTest, SpecialNumbers) { diff --git a/libc/test/src/math/smoke/tanhf_test.cpp b/libc/test/src/math/smoke/tanhf_test.cpp index b12a331..57c0573 100644 --- a/libc/test/src/math/smoke/tanhf_test.cpp +++ b/libc/test/src/math/smoke/tanhf_test.cpp @@ -7,14 +7,13 @@ //===----------------------------------------------------------------------===// #include "hdr/math_macros.h" +#include "hdr/stdint_proxy.h" #include "src/__support/FPUtil/FPBits.h" #include "src/__support/libc_errno.h" #include "src/math/tanhf.h" #include "test/UnitTest/FPMatcher.h" #include "test/UnitTest/Test.h" -#include <stdint.h> - using LlvmLibcTanhfTest = LIBC_NAMESPACE::testing::FPTest<float>; TEST_F(LlvmLibcTanhfTest, SpecialNumbers) { diff --git a/libc/test/src/math/tanf_test.cpp b/libc/test/src/math/tanf_test.cpp index ecc7019..27949eb 100644 --- a/libc/test/src/math/tanf_test.cpp +++ b/libc/test/src/math/tanf_test.cpp @@ -15,7 +15,7 @@ #include "test/src/math/sdcomp26094.h" #include "utils/MPFRWrapper/MPFRUtils.h" -#include <stdint.h> +#include "hdr/stdint_proxy.h" using LlvmLibcTanfTest = LIBC_NAMESPACE::testing::FPTest<float>; diff --git a/libc/test/src/math/tanhf_test.cpp b/libc/test/src/math/tanhf_test.cpp index 966ce64..27a6cbc 100644 --- a/libc/test/src/math/tanhf_test.cpp +++ b/libc/test/src/math/tanhf_test.cpp @@ -14,7 +14,7 @@ #include "test/UnitTest/Test.h" #include "utils/MPFRWrapper/MPFRUtils.h" -#include <stdint.h> +#include "hdr/stdint_proxy.h" using LlvmLibcTanhfTest = LIBC_NAMESPACE::testing::FPTest<float>; diff --git a/libc/test/src/signal/CMakeLists.txt b/libc/test/src/signal/CMakeLists.txt index f86ce2a..6b5041d 100644 --- a/libc/test/src/signal/CMakeLists.txt +++ b/libc/test/src/signal/CMakeLists.txt @@ -119,6 +119,7 @@ add_libc_unittest( sigaltstack_test.cpp DEPENDS libc.hdr.signal_macros + libc.hdr.stdint_proxy libc.src.errno.errno libc.src.signal.raise libc.src.signal.sigaltstack diff --git a/libc/test/src/signal/sigaltstack_test.cpp b/libc/test/src/signal/sigaltstack_test.cpp index ce4dfdd..a9c5cd9 100644 --- a/libc/test/src/signal/sigaltstack_test.cpp +++ b/libc/test/src/signal/sigaltstack_test.cpp @@ -7,6 +7,7 @@ //===----------------------------------------------------------------------===// #include "hdr/signal_macros.h" +#include "hdr/stdint_proxy.h" #include "src/__support/OSUtil/syscall.h" // For internal syscall function. #include "src/__support/libc_errno.h" #include "src/signal/linux/signal_utils.h" @@ -16,7 +17,6 @@ #include "test/UnitTest/ErrnoSetterMatcher.h" #include "test/UnitTest/Test.h" -#include <stdint.h> #include <sys/syscall.h> constexpr int LOCAL_VAR_SIZE = 512; diff --git a/libc/test/src/spawn/CMakeLists.txt b/libc/test/src/spawn/CMakeLists.txt index ce246d4..04814db 100644 --- a/libc/test/src/spawn/CMakeLists.txt +++ b/libc/test/src/spawn/CMakeLists.txt @@ -7,6 +7,7 @@ add_libc_unittest( SRCS posix_spawn_file_actions_test.cpp DEPENDS + libc.hdr.stdint_proxy libc.include.spawn libc.src.spawn.file_actions libc.src.spawn.posix_spawn_file_actions_addclose diff --git a/libc/test/src/spawn/posix_spawn_file_actions_test.cpp b/libc/test/src/spawn/posix_spawn_file_actions_test.cpp index 01ccb82..935a354 100644 --- a/libc/test/src/spawn/posix_spawn_file_actions_test.cpp +++ b/libc/test/src/spawn/posix_spawn_file_actions_test.cpp @@ -6,6 +6,7 @@ // //===----------------------------------------------------------------------===// +#include "hdr/stdint_proxy.h" #include "src/__support/libc_errno.h" #include "src/spawn/file_actions.h" #include "src/spawn/posix_spawn_file_actions_addclose.h" @@ -16,7 +17,6 @@ #include "test/UnitTest/Test.h" #include <spawn.h> -#include <stdint.h> TEST(LlvmLibcPosixSpawnFileActionsTest, AddActions) { posix_spawn_file_actions_t actions; diff --git a/libc/test/src/stdfix/IdivTest.h b/libc/test/src/stdfix/IdivTest.h index 0e9cc40..28c39f4 100644 --- a/libc/test/src/stdfix/IdivTest.h +++ b/libc/test/src/stdfix/IdivTest.h @@ -71,7 +71,7 @@ public: } }; -#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER) +#if defined(LIBC_ADD_NULL_CHECKS) #define LIST_IDIV_TESTS(Name, T, XType, func) \ using LlvmLibcIdiv##Name##Test = IdivTest<T, XType>; \ TEST_F(LlvmLibcIdiv##Name##Test, InvalidNumbers) { \ @@ -88,4 +88,4 @@ public: testSpecialNumbers(&func); \ } \ static_assert(true, "Require semicolon.") -#endif // LIBC_HAS_ADDRESS_SANITIZER +#endif // LIBC_ADD_NULL_CHECKS diff --git a/libc/test/src/stdlib/CMakeLists.txt b/libc/test/src/stdlib/CMakeLists.txt index 45fd49b..0eb373c 100644 --- a/libc/test/src/stdlib/CMakeLists.txt +++ b/libc/test/src/stdlib/CMakeLists.txt @@ -99,6 +99,7 @@ add_libc_test( SRCS strtoint32_test.cpp DEPENDS + libc.hdr.stdint_proxy libc.src.__support.str_to_integer libc.src.errno.errno .strtol_test_support @@ -111,6 +112,7 @@ add_libc_test( SRCS strtoint64_test.cpp DEPENDS + libc.hdr.stdint_proxy libc.src.__support.str_to_integer libc.src.errno.errno .strtol_test_support @@ -380,6 +382,7 @@ add_libc_test( SRCS memalignment_test.cpp DEPENDS + libc.hdr.stdint_proxy libc.include.stdlib libc.src.stdlib.memalignment ) diff --git a/libc/test/src/stdlib/memalignment_test.cpp b/libc/test/src/stdlib/memalignment_test.cpp index 2ca1b79..f1640e9 100644 --- a/libc/test/src/stdlib/memalignment_test.cpp +++ b/libc/test/src/stdlib/memalignment_test.cpp @@ -6,11 +6,10 @@ // //===----------------------------------------------------------------------===// +#include "hdr/stdint_proxy.h" #include "src/stdlib/memalignment.h" #include "test/UnitTest/Test.h" -#include <stdint.h> - TEST(LlvmLibcMemAlignmentTest, NullPointer) { void *ptr = nullptr; EXPECT_EQ(LIBC_NAMESPACE::memalignment(ptr), static_cast<size_t>(0)); diff --git a/libc/test/src/stdlib/strtoint32_test.cpp b/libc/test/src/stdlib/strtoint32_test.cpp index e6da692..1bf1994 100644 --- a/libc/test/src/stdlib/strtoint32_test.cpp +++ b/libc/test/src/stdlib/strtoint32_test.cpp @@ -6,8 +6,7 @@ // //===----------------------------------------------------------------------===// -#include <stdint.h> - +#include "hdr/stdint_proxy.h" #include "src/__support/libc_errno.h" #include "src/__support/macros/config.h" #include "src/__support/str_to_integer.h" diff --git a/libc/test/src/stdlib/strtoint64_test.cpp b/libc/test/src/stdlib/strtoint64_test.cpp index 2c5d948..2b009d7 100644 --- a/libc/test/src/stdlib/strtoint64_test.cpp +++ b/libc/test/src/stdlib/strtoint64_test.cpp @@ -6,8 +6,7 @@ // //===----------------------------------------------------------------------===// -#include <stdint.h> - +#include "hdr/stdint_proxy.h" #include "src/__support/libc_errno.h" #include "src/__support/macros/config.h" #include "src/__support/str_to_integer.h" diff --git a/libc/test/src/string/memchr_test.cpp b/libc/test/src/string/memchr_test.cpp index 1455183..4a7c88b 100644 --- a/libc/test/src/string/memchr_test.cpp +++ b/libc/test/src/string/memchr_test.cpp @@ -122,11 +122,11 @@ TEST(LlvmLibcMemChrTest, SignedCharacterFound) { ASSERT_EQ(actual[0], c); } -#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER) +#if defined(LIBC_ADD_NULL_CHECKS) TEST(LlvmLibcMemChrTest, CrashOnNullPtr) { ASSERT_DEATH([]() { LIBC_NAMESPACE::memchr(nullptr, 1, 1); }, WITH_SIGNAL(-1)); } -#endif // defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER) +#endif // defined(LIBC_ADD_NULL_CHECKS) diff --git a/libc/test/src/string/memcmp_test.cpp b/libc/test/src/string/memcmp_test.cpp index 3dfbced..99d08a4 100644 --- a/libc/test/src/string/memcmp_test.cpp +++ b/libc/test/src/string/memcmp_test.cpp @@ -66,13 +66,13 @@ TEST(LlvmLibcMemcmpTest, SizeSweep) { } } -#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER) +#if defined(LIBC_ADD_NULL_CHECKS) TEST(LlvmLibcMemcmpTest, CrashOnNullPtr) { ASSERT_DEATH([]() { LIBC_NAMESPACE::memcmp(nullptr, nullptr, 1); }, WITH_SIGNAL(-1)); } -#endif // defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER) +#endif // defined(LIBC_ADD_NULL_CHECKS) } // namespace LIBC_NAMESPACE_DECL diff --git a/libc/test/src/string/memcpy_test.cpp b/libc/test/src/string/memcpy_test.cpp index 8c43ac8..03a3d13 100644 --- a/libc/test/src/string/memcpy_test.cpp +++ b/libc/test/src/string/memcpy_test.cpp @@ -73,12 +73,12 @@ TEST(LlvmLibcMemcpyTest, CheckAccess) { #endif // !defined(LIBC_FULL_BUILD) && defined(LIBC_TARGET_OS_IS_LINUX) -#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER) +#if defined(LIBC_ADD_NULL_CHECKS) TEST(LlvmLibcMemcpyTest, CrashOnNullPtr) { ASSERT_DEATH([]() { LIBC_NAMESPACE::memcpy(nullptr, nullptr, 1); }, WITH_SIGNAL(-1)); } -#endif // defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER) +#endif // defined(LIBC_ADD_NULL_CHECKS) } // namespace LIBC_NAMESPACE_DECL diff --git a/libc/test/src/string/memmove_test.cpp b/libc/test/src/string/memmove_test.cpp index 0d47655..60ac680 100644 --- a/libc/test/src/string/memmove_test.cpp +++ b/libc/test/src/string/memmove_test.cpp @@ -104,13 +104,13 @@ TEST(LlvmLibcMemmoveTest, SizeSweep) { } } -#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER) +#if defined(LIBC_ADD_NULL_CHECKS) TEST(LlvmLibcMemmoveTest, CrashOnNullPtr) { ASSERT_DEATH([]() { LIBC_NAMESPACE::memmove(nullptr, nullptr, 2); }, WITH_SIGNAL(-1)); } -#endif // LIBC_TARGET_OS_IS_LINUX +#endif // LIBC_ADD_NULL_CHECKS } // namespace LIBC_NAMESPACE_DECL diff --git a/libc/test/src/string/memory_utils/CMakeLists.txt b/libc/test/src/string/memory_utils/CMakeLists.txt index 8374be4..d6d6d09 100644 --- a/libc/test/src/string/memory_utils/CMakeLists.txt +++ b/libc/test/src/string/memory_utils/CMakeLists.txt @@ -9,6 +9,7 @@ add_libc_test( COMPILE_OPTIONS ${LIBC_COMPILE_OPTIONS_NATIVE} DEPENDS + libc.hdr.stdint_proxy libc.src.__support.CPP.array libc.src.__support.CPP.cstddef libc.src.__support.CPP.span diff --git a/libc/test/src/string/memory_utils/memory_check_utils.h b/libc/test/src/string/memory_utils/memory_check_utils.h index db9cfda..c38039e 100644 --- a/libc/test/src/string/memory_utils/memory_check_utils.h +++ b/libc/test/src/string/memory_utils/memory_check_utils.h @@ -9,13 +9,13 @@ #ifndef LIBC_TEST_SRC_STRING_MEMORY_UTILS_MEMORY_CHECK_UTILS_H #define LIBC_TEST_SRC_STRING_MEMORY_UTILS_MEMORY_CHECK_UTILS_H +#include "hdr/stdint_proxy.h" // uintxx_t #include "src/__support/CPP/span.h" #include "src/__support/libc_assert.h" // LIBC_ASSERT #include "src/__support/macros/config.h" #include "src/__support/macros/sanitizer.h" #include "src/string/memory_utils/utils.h" #include <stddef.h> // size_t -#include <stdint.h> // uintxx_t #include <stdlib.h> // malloc/free namespace LIBC_NAMESPACE_DECL { diff --git a/libc/test/src/string/memory_utils/protected_pages.h b/libc/test/src/string/memory_utils/protected_pages.h index 50cfbaa..65578d1 100644 --- a/libc/test/src/string/memory_utils/protected_pages.h +++ b/libc/test/src/string/memory_utils/protected_pages.h @@ -18,9 +18,9 @@ #error "Protected pages requires mmap and cannot be used in full build mode." #endif // defined(LIBC_FULL_BUILD) || !defined(LIBC_TARGET_OS_IS_LINUX) +#include "hdr/stdint_proxy.h" // uint8_t #include "src/__support/macros/attributes.h" // LIBC_INLINE #include <stddef.h> // size_t -#include <stdint.h> // uint8_t #include <sys/mman.h> // mmap, munmap #include <unistd.h> // sysconf, _SC_PAGESIZE diff --git a/libc/test/src/string/mempcpy_test.cpp b/libc/test/src/string/mempcpy_test.cpp index 24482a8..7351a82 100644 --- a/libc/test/src/string/mempcpy_test.cpp +++ b/libc/test/src/string/mempcpy_test.cpp @@ -27,11 +27,11 @@ TEST(LlvmLibcMempcpyTest, ZeroCount) { ASSERT_EQ(static_cast<char *>(result), dest + 0); } -#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER) +#if defined(LIBC_ADD_NULL_CHECKS) TEST(LlvmLibcMempcpyTest, CrashOnNullPtr) { ASSERT_DEATH([]() { LIBC_NAMESPACE::mempcpy(nullptr, nullptr, 1); }, WITH_SIGNAL(-1)); } -#endif // defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER) +#endif // defined(LIBC_ADD_NULL_CHECKS) diff --git a/libc/test/src/string/memrchr_test.cpp b/libc/test/src/string/memrchr_test.cpp index c73a479..140395b 100644 --- a/libc/test/src/string/memrchr_test.cpp +++ b/libc/test/src/string/memrchr_test.cpp @@ -114,11 +114,11 @@ TEST(LlvmLibcMemRChrTest, ZeroLengthShouldReturnNullptr) { ASSERT_STREQ(call_memrchr(src, 'd', 0), nullptr); } -#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER) +#if defined(LIBC_ADD_NULL_CHECKS) TEST(LlvmLibcMemRChrTest, CrashOnNullPtr) { ASSERT_DEATH([]() { LIBC_NAMESPACE::memrchr(nullptr, 'd', 1); }, WITH_SIGNAL(-1)); } -#endif // defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER) +#endif // defined(LIBC_ADD_NULL_CHECKS) diff --git a/libc/test/src/string/memset_test.cpp b/libc/test/src/string/memset_test.cpp index 9562d2d2..8268d31 100644 --- a/libc/test/src/string/memset_test.cpp +++ b/libc/test/src/string/memset_test.cpp @@ -60,13 +60,13 @@ TEST(LlvmLibcMemsetTest, CheckAccess) { #endif // !defined(LIBC_FULL_BUILD) && defined(LIBC_TARGET_OS_IS_LINUX) -#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER) +#if defined(LIBC_ADD_NULL_CHECKS) TEST(LlvmLibcMemsetTest, CrashOnNullPtr) { ASSERT_DEATH([]() { LIBC_NAMESPACE::memset(nullptr, 0, 1); }, WITH_SIGNAL(-1)); } -#endif // defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER) +#endif // defined(LIBC_ADD_NULL_CHECKS) } // namespace LIBC_NAMESPACE_DECL diff --git a/libc/test/src/string/stpncpy_test.cpp b/libc/test/src/string/stpncpy_test.cpp index f5c61e2..8344926 100644 --- a/libc/test/src/string/stpncpy_test.cpp +++ b/libc/test/src/string/stpncpy_test.cpp @@ -73,11 +73,11 @@ TEST_F(LlvmLibcStpncpyTest, CopyTwoWithNull) { check_stpncpy(dst, src, 2, expected, 1); } -#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER) +#if defined(LIBC_ADD_NULL_CHECKS) TEST_F(LlvmLibcStpncpyTest, CrashOnNullPtr) { ASSERT_DEATH([]() { LIBC_NAMESPACE::stpncpy(nullptr, nullptr, 1); }, WITH_SIGNAL(-1)); } -#endif // defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER) +#endif // defined(LIBC_ADD_NULL_CHECKS) diff --git a/libc/test/src/string/strcat_test.cpp b/libc/test/src/string/strcat_test.cpp index 20f8d11..baaf455 100644 --- a/libc/test/src/string/strcat_test.cpp +++ b/libc/test/src/string/strcat_test.cpp @@ -37,11 +37,11 @@ TEST(LlvmLibcStrCatTest, NonEmptyDest) { ASSERT_STREQ(dest, "xyzabc"); } -#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER) +#if defined(LIBC_ADD_NULL_CHECKS) TEST(LlvmLibcStrCatTest, CrashOnNullPtr) { ASSERT_DEATH([]() { LIBC_NAMESPACE::strcat(nullptr, nullptr); }, WITH_SIGNAL(-1)); } -#endif // defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER) +#endif // defined(LIBC_ADD_NULL_CHECKS) diff --git a/libc/test/src/string/strcoll_test.cpp b/libc/test/src/string/strcoll_test.cpp index 268e232..1be7568 100644 --- a/libc/test/src/string/strcoll_test.cpp +++ b/libc/test/src/string/strcoll_test.cpp @@ -30,11 +30,11 @@ TEST(LlvmLibcStrcollTest, SimpleTest) { ASSERT_GT(result, 0); } -#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER) +#if defined(LIBC_ADD_NULL_CHECKS) TEST(LlvmLibcStrcollTest, CrashOnNullPtr) { ASSERT_DEATH([]() { LIBC_NAMESPACE::strcoll(nullptr, nullptr); }, WITH_SIGNAL(-1)); } -#endif // defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER) +#endif // defined(LIBC_ADD_NULL_CHECKS) diff --git a/libc/test/src/string/strcpy_test.cpp b/libc/test/src/string/strcpy_test.cpp index ead60be..0041d38 100644 --- a/libc/test/src/string/strcpy_test.cpp +++ b/libc/test/src/string/strcpy_test.cpp @@ -44,11 +44,11 @@ TEST(LlvmLibcStrCpyTest, OffsetDest) { ASSERT_STREQ(dest, "xyzabc"); } -#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER) +#if defined(LIBC_ADD_NULL_CHECKS) TEST(LlvmLibcStrCpyTest, CrashOnNullPtr) { ASSERT_DEATH([]() { LIBC_NAMESPACE::strcpy(nullptr, nullptr); }, WITH_SIGNAL(-1)); } -#endif // defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER) +#endif // defined(LIBC_ADD_NULL_CHECKS) diff --git a/libc/test/src/string/strsep_test.cpp b/libc/test/src/string/strsep_test.cpp index 6f02ce3..06318de 100644 --- a/libc/test/src/string/strsep_test.cpp +++ b/libc/test/src/string/strsep_test.cpp @@ -53,11 +53,11 @@ TEST(LlvmLibcStrsepTest, DelimitersShouldNotBeIncludedInToken) { } } -#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER) +#if defined(LIBC_ADD_NULL_CHECKS) TEST(LlvmLibcStrsepTest, CrashOnNullPtr) { ASSERT_DEATH([]() { LIBC_NAMESPACE::strsep(nullptr, nullptr); }, WITH_SIGNAL(-1)); } -#endif // defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER) +#endif // defined(LIBC_ADD_NULL_CHECKS) diff --git a/libc/test/src/string/strspn_test.cpp b/libc/test/src/string/strspn_test.cpp index adf9a45..82f9b2a 100644 --- a/libc/test/src/string/strspn_test.cpp +++ b/libc/test/src/string/strspn_test.cpp @@ -85,11 +85,11 @@ TEST(LlvmLibcStrSpnTest, DuplicatedCharactersToBeSearchedForShouldStillMatch) { EXPECT_EQ(LIBC_NAMESPACE::strspn("aaaa", "aa"), size_t{4}); } -#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER) +#if defined(LIBC_ADD_NULL_CHECKS) TEST(LlvmLibcStrSpnTest, CrashOnNullPtr) { ASSERT_DEATH([]() { LIBC_NAMESPACE::strspn(nullptr, nullptr); }, WITH_SIGNAL(-1)); } -#endif // defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER) +#endif // defined(LIBC_ADD_NULL_CHECKS) diff --git a/libc/test/src/wchar/CMakeLists.txt b/libc/test/src/wchar/CMakeLists.txt index 176cf7c..fad89dc 100644 --- a/libc/test/src/wchar/CMakeLists.txt +++ b/libc/test/src/wchar/CMakeLists.txt @@ -25,6 +25,17 @@ add_libc_test( ) add_libc_test( + wcsdup_test + SUITE + libc_wchar_unittests + SRCS + wcsdup_test.cpp + DEPENDS + libc.hdr.types.wchar_t + libc.src.wchar.wcsdup +) + +add_libc_test( btowc_test SUITE libc_wchar_unittests @@ -65,6 +76,48 @@ add_libc_test( ) add_libc_test( + mblen_test + SUITE + libc_wchar_unittests + SRCS + mblen_test.cpp + DEPENDS + libc.src.__support.libc_errno + libc.src.wchar.mblen + libc.test.UnitTest.ErrnoCheckingTest +) + +add_libc_test( + mbrlen_test + SUITE + libc_wchar_unittests + SRCS + mbrlen_test.cpp + DEPENDS + libc.src.__support.libc_errno + libc.src.__support.wchar.mbstate + libc.src.string.memset + libc.src.wchar.mbrlen + libc.hdr.types.mbstate_t + libc.hdr.types.wchar_t + libc.test.UnitTest.ErrnoCheckingTest +) + +add_libc_test( + mbsinit_test + SUITE + libc_wchar_unittests + SRCS + mbsinit_test.cpp + DEPENDS + libc.src.string.memset + libc.src.wchar.mbsinit + libc.src.wchar.mbrtowc + libc.hdr.types.mbstate_t + libc.hdr.types.wchar_t +) + +add_libc_test( wctob_test SUITE libc_wchar_unittests @@ -102,6 +155,46 @@ add_libc_test( ) add_libc_test( + wcstombs_test + SUITE + libc_wchar_unittests + SRCS + wcstombs_test.cpp + DEPENDS + libc.src.wchar.wcstombs + libc.test.UnitTest.ErrnoCheckingTest + libc.hdr.types.wchar_t +) + +add_libc_test( + wcsrtombs_test + SUITE + libc_wchar_unittests + SRCS + wcsrtombs_test.cpp + DEPENDS + libc.src.wchar.wcsrtombs + libc.test.UnitTest.ErrnoCheckingTest + libc.hdr.types.wchar_t + libc.src.string.memset + libc.hdr.types.mbstate_t +) + +add_libc_test( + wcsnrtombs_test + SUITE + libc_wchar_unittests + SRCS + wcsnrtombs_test.cpp + DEPENDS + libc.src.wchar.wcsnrtombs + libc.test.UnitTest.ErrnoCheckingTest + libc.hdr.types.wchar_t + libc.src.string.memset + libc.hdr.types.mbstate_t +) + +add_libc_test( wmemset_test SUITE libc_wchar_unittests diff --git a/libc/test/src/wchar/mblen_test.cpp b/libc/test/src/wchar/mblen_test.cpp new file mode 100644 index 0000000..efd4df7 --- /dev/null +++ b/libc/test/src/wchar/mblen_test.cpp @@ -0,0 +1,104 @@ +//===-- Unittests for mblen -----------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +#include "src/__support/libc_errno.h" +#include "src/wchar/mblen.h" +#include "test/UnitTest/ErrnoCheckingTest.h" +#include "test/UnitTest/Test.h" + +using LlvmLibcMBLenTest = LIBC_NAMESPACE::testing::ErrnoCheckingTest; + +TEST_F(LlvmLibcMBLenTest, OneByte) { + const char *ch = "A"; + int n = LIBC_NAMESPACE::mblen(ch, 1); + ASSERT_ERRNO_SUCCESS(); + ASSERT_EQ(n, 1); + + // Should fail since we have not read enough + n = LIBC_NAMESPACE::mblen(ch, 0); + ASSERT_ERRNO_SUCCESS(); + ASSERT_EQ(n, -1); +} + +TEST_F(LlvmLibcMBLenTest, TwoByte) { + const char ch[2] = {static_cast<char>(0xC2), + static_cast<char>(0x8E)}; // car symbol + int n = LIBC_NAMESPACE::mblen(ch, 4); + ASSERT_ERRNO_SUCCESS(); + ASSERT_EQ(n, 2); + + // Should fail since we have not read enough + n = LIBC_NAMESPACE::mblen(ch, 1); + ASSERT_EQ(n, -1); + ASSERT_ERRNO_SUCCESS(); + // Should fail after trying to read next byte too + n = LIBC_NAMESPACE::mblen(ch + 1, 1); + ASSERT_EQ(n, -1); + // This one should be an invalid starting byte so should set errno + ASSERT_ERRNO_EQ(EILSEQ); +} + +TEST_F(LlvmLibcMBLenTest, ThreeByte) { + const char ch[3] = {static_cast<char>(0xE2), static_cast<char>(0x88), + static_cast<char>(0x91)}; // ∑ sigma symbol + int n = LIBC_NAMESPACE::mblen(ch, 3); + ASSERT_EQ(n, 3); + ASSERT_ERRNO_SUCCESS(); + + // Should fail since we have not read enough + n = LIBC_NAMESPACE::mblen(ch, 2); + ASSERT_EQ(n, -1); + ASSERT_ERRNO_SUCCESS(); +} + +TEST_F(LlvmLibcMBLenTest, FourByte) { + const char ch[4] = {static_cast<char>(0xF0), static_cast<char>(0x9F), + static_cast<char>(0xA4), + static_cast<char>(0xA1)}; // 🤡 clown emoji + int n = LIBC_NAMESPACE::mblen(ch, 4); + ASSERT_EQ(n, 4); + ASSERT_ERRNO_SUCCESS(); + + // Should fail since we have not read enough + n = LIBC_NAMESPACE::mblen(ch, 2); + ASSERT_EQ(n, -1); + ASSERT_ERRNO_SUCCESS(); +} + +TEST_F(LlvmLibcMBLenTest, InvalidByte) { + const char ch[1] = {static_cast<char>(0x80)}; + int n = LIBC_NAMESPACE::mblen(ch, 1); + ASSERT_EQ(n, -1); + ASSERT_ERRNO_EQ(EILSEQ); +} + +TEST_F(LlvmLibcMBLenTest, InvalidMultiByte) { + const char ch[4] = {static_cast<char>(0x80), static_cast<char>(0x00), + static_cast<char>(0x80), + static_cast<char>(0x00)}; // invalid sequence of bytes + // Trying to push all 4 should error + int n = LIBC_NAMESPACE::mblen(ch, 4); + ASSERT_EQ(n, -1); + ASSERT_ERRNO_EQ(EILSEQ); + + // Trying to push the second and third should correspond to null wc + n = LIBC_NAMESPACE::mblen(ch + 1, 2); + ASSERT_EQ(n, 0); + ASSERT_ERRNO_SUCCESS(); +} + +TEST_F(LlvmLibcMBLenTest, NullString) { + // reading on nullptr should return 0 + int n = LIBC_NAMESPACE::mblen(nullptr, 2); + ASSERT_EQ(n, 0); + ASSERT_ERRNO_SUCCESS(); + // reading a null terminator should return 0 + const char *ch = "\0"; + n = LIBC_NAMESPACE::mblen(ch, 1); + ASSERT_EQ(n, 0); +} diff --git a/libc/test/src/wchar/mbrlen_test.cpp b/libc/test/src/wchar/mbrlen_test.cpp new file mode 100644 index 0000000..e1452bf4 --- /dev/null +++ b/libc/test/src/wchar/mbrlen_test.cpp @@ -0,0 +1,139 @@ +//===-- Unittests for mbrlen ----------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +#include "hdr/types/wchar_t.h" +#include "src/__support/libc_errno.h" +#include "src/__support/wchar/mbstate.h" +#include "src/string/memset.h" +#include "src/wchar/mbrlen.h" +#include "test/UnitTest/ErrnoCheckingTest.h" +#include "test/UnitTest/Test.h" + +using LlvmLibcMBRLenTest = LIBC_NAMESPACE::testing::ErrnoCheckingTest; + +TEST_F(LlvmLibcMBRLenTest, OneByte) { + const char *ch = "A"; + mbstate_t mb; + LIBC_NAMESPACE::memset(&mb, 0, sizeof(mbstate_t)); + size_t n = LIBC_NAMESPACE::mbrlen(ch, 1, &mb); + ASSERT_ERRNO_SUCCESS(); + ASSERT_EQ(n, static_cast<size_t>(1)); + + // Should fail since we have not read enough + n = LIBC_NAMESPACE::mbrlen(ch, 0, &mb); + ASSERT_ERRNO_SUCCESS(); + ASSERT_EQ(n, static_cast<size_t>(-2)); +} + +TEST_F(LlvmLibcMBRLenTest, TwoByte) { + const char ch[2] = {static_cast<char>(0xC2), + static_cast<char>(0x8E)}; // car symbol + mbstate_t mb; + LIBC_NAMESPACE::memset(&mb, 0, sizeof(mbstate_t)); + size_t n = LIBC_NAMESPACE::mbrlen(ch, 4, nullptr); + ASSERT_ERRNO_SUCCESS(); + ASSERT_EQ(static_cast<int>(n), 2); + + // Should fail since we have not read enough + n = LIBC_NAMESPACE::mbrlen(ch, 1, &mb); + ASSERT_EQ(static_cast<int>(n), -2); + ASSERT_ERRNO_SUCCESS(); + // Should pass after trying to read next byte + n = LIBC_NAMESPACE::mbrlen(ch + 1, 1, &mb); + ASSERT_EQ(static_cast<int>(n), 1); + ASSERT_ERRNO_SUCCESS(); +} + +TEST_F(LlvmLibcMBRLenTest, ThreeByte) { + const char ch[3] = {static_cast<char>(0xE2), static_cast<char>(0x88), + static_cast<char>(0x91)}; // ∑ sigma symbol + mbstate_t mb; + LIBC_NAMESPACE::memset(&mb, 0, sizeof(mbstate_t)); + size_t n = LIBC_NAMESPACE::mbrlen(ch, 3, &mb); + ASSERT_EQ(static_cast<int>(n), 3); + ASSERT_ERRNO_SUCCESS(); + + // Should fail since we have not read enough + n = LIBC_NAMESPACE::mbrlen(ch, 2, &mb); + ASSERT_EQ(static_cast<int>(n), -2); + ASSERT_ERRNO_SUCCESS(); +} + +TEST_F(LlvmLibcMBRLenTest, FourByte) { + const char ch[4] = {static_cast<char>(0xF0), static_cast<char>(0x9F), + static_cast<char>(0xA4), + static_cast<char>(0xA1)}; // 🤡 clown emoji + mbstate_t mb; + LIBC_NAMESPACE::memset(&mb, 0, sizeof(mbstate_t)); + size_t n = LIBC_NAMESPACE::mbrlen(ch, 4, &mb); + ASSERT_EQ(static_cast<int>(n), 4); + ASSERT_ERRNO_SUCCESS(); + + // Should fail since we have not read enough + n = LIBC_NAMESPACE::mbrlen(ch, 2, &mb); + ASSERT_EQ(static_cast<int>(n), -2); + ASSERT_ERRNO_SUCCESS(); + + // Should fail since we have not read enough + n = LIBC_NAMESPACE::mbrlen(ch + 2, 1, &mb); + ASSERT_EQ(static_cast<int>(n), -2); + ASSERT_ERRNO_SUCCESS(); + + // Should pass after reading final byte + n = LIBC_NAMESPACE::mbrlen(ch + 3, 5, &mb); + ASSERT_EQ(static_cast<int>(n), 1); + ASSERT_ERRNO_SUCCESS(); +} + +TEST_F(LlvmLibcMBRLenTest, InvalidByte) { + const char ch[1] = {static_cast<char>(0x80)}; + size_t n = LIBC_NAMESPACE::mbrlen(ch, 1, nullptr); + ASSERT_EQ(static_cast<int>(n), -1); + ASSERT_ERRNO_EQ(EILSEQ); +} + +TEST_F(LlvmLibcMBRLenTest, InvalidMultiByte) { + const char ch[4] = {static_cast<char>(0x80), static_cast<char>(0x00), + static_cast<char>(0x80), + static_cast<char>(0x00)}; // invalid sequence of bytes + mbstate_t mb; + LIBC_NAMESPACE::memset(&mb, 0, sizeof(mbstate_t)); + // Trying to push all 4 should error + size_t n = LIBC_NAMESPACE::mbrlen(ch, 4, &mb); + ASSERT_EQ(static_cast<int>(n), -1); + ASSERT_ERRNO_EQ(EILSEQ); + + // Trying to push the second and third should correspond to null wc + n = LIBC_NAMESPACE::mbrlen(ch + 1, 2, &mb); + ASSERT_EQ(static_cast<int>(n), 0); + ASSERT_ERRNO_SUCCESS(); +} + +TEST_F(LlvmLibcMBRLenTest, NullString) { + // reading on nullptr should return 0 + size_t n = LIBC_NAMESPACE::mbrlen(nullptr, 2, nullptr); + ASSERT_EQ(static_cast<int>(n), 0); + ASSERT_ERRNO_SUCCESS(); + // reading a null terminator should return 0 + const char *ch = "\0"; + n = LIBC_NAMESPACE::mbrlen(ch, 1, nullptr); + ASSERT_EQ(static_cast<int>(n), 0); +} + +TEST_F(LlvmLibcMBRLenTest, InvalidMBState) { + const char ch[4] = {static_cast<char>(0xC2), static_cast<char>(0x8E), + static_cast<char>(0xC7), static_cast<char>(0x8C)}; + mbstate_t *mb; + LIBC_NAMESPACE::internal::mbstate inv; + inv.total_bytes = 6; + mb = reinterpret_cast<mbstate_t *>(&inv); + // invalid mbstate should error + size_t n = LIBC_NAMESPACE::mbrlen(ch, 2, mb); + ASSERT_EQ(static_cast<int>(n), -1); + ASSERT_ERRNO_EQ(EINVAL); +} diff --git a/libc/test/src/wchar/mbrtowc_test.cpp b/libc/test/src/wchar/mbrtowc_test.cpp index 5a14d8e..c406300 100644 --- a/libc/test/src/wchar/mbrtowc_test.cpp +++ b/libc/test/src/wchar/mbrtowc_test.cpp @@ -190,6 +190,18 @@ TEST_F(LlvmLibcMBRToWCTest, NullString) { ASSERT_ERRNO_SUCCESS(); } +TEST_F(LlvmLibcMBRToWCTest, NullDest) { + const char ch[4] = {static_cast<char>(0xF0), static_cast<char>(0x9F), + static_cast<char>(0xA4), + static_cast<char>(0xA1)}; // 🤡 clown emoji + mbstate_t *mb; + LIBC_NAMESPACE::memset(&mb, 0, sizeof(mbstate_t)); + // reading nullptr should return correct size + size_t n = LIBC_NAMESPACE::mbrtowc(nullptr, ch, 10, mb); + ASSERT_EQ(static_cast<int>(n), 4); + ASSERT_ERRNO_SUCCESS(); +} + TEST_F(LlvmLibcMBRToWCTest, InvalidMBState) { const char ch[4] = {static_cast<char>(0xC2), static_cast<char>(0x8E), static_cast<char>(0xC7), static_cast<char>(0x8C)}; diff --git a/libc/test/src/wchar/mbsinit_test.cpp b/libc/test/src/wchar/mbsinit_test.cpp new file mode 100644 index 0000000..ecb48aa --- /dev/null +++ b/libc/test/src/wchar/mbsinit_test.cpp @@ -0,0 +1,33 @@ +//===-- Unittests for mbsinit ---------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +#include "hdr/types/wchar_t.h" +#include "src/string/memset.h" +#include "src/wchar/mbrtowc.h" +#include "src/wchar/mbsinit.h" +#include "test/UnitTest/Test.h" + +TEST(LlvmLibcMBSInitTest, EmptyState) { + mbstate_t ps; + LIBC_NAMESPACE::memset(&ps, 0, sizeof(mbstate_t)); + ASSERT_NE(LIBC_NAMESPACE::mbsinit(&ps), 0); + ASSERT_NE(LIBC_NAMESPACE::mbsinit(nullptr), 0); +} + +TEST(LlvmLibcMBSInitTest, ConversionTest) { + const char *src = "\xf0\x9f\xa4\xa3"; // 4 byte emoji + wchar_t dest[2]; + mbstate_t ps; + LIBC_NAMESPACE::memset(&ps, 0, sizeof(mbstate_t)); + + ASSERT_NE(LIBC_NAMESPACE::mbsinit(&ps), 0); + LIBC_NAMESPACE::mbrtowc(dest, src, 2, &ps); // partial conversion + ASSERT_EQ(LIBC_NAMESPACE::mbsinit(&ps), 0); + LIBC_NAMESPACE::mbrtowc(dest, src + 2, 2, &ps); // complete conversion + ASSERT_NE(LIBC_NAMESPACE::mbsinit(&ps), 0); // state should be reset now +} diff --git a/libc/test/src/wchar/wcpncpy_test.cpp b/libc/test/src/wchar/wcpncpy_test.cpp index bb72211..6c6faf8 100644 --- a/libc/test/src/wchar/wcpncpy_test.cpp +++ b/libc/test/src/wchar/wcpncpy_test.cpp @@ -84,10 +84,10 @@ TEST(LlvmLibcWCPNCpyTest, CopyAndFill) { ASSERT_EQ(dest + 1, res); } -#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER) +#if defined(LIBC_ADD_NULL_CHECKS) TEST(LlvmLibcWCPNCpyTest, NullptrCrash) { // Passing in a nullptr should crash the program. EXPECT_DEATH([] { LIBC_NAMESPACE::wcpncpy(nullptr, nullptr, 1); }, WITH_SIGNAL(-1)); } -#endif // LIBC_HAS_ADDRESS_SANITIZER +#endif // LIBC_ADD_NULL_CHECKS diff --git a/libc/test/src/wchar/wcscmp_test.cpp b/libc/test/src/wchar/wcscmp_test.cpp index 6572aad..ace95e83 100644 --- a/libc/test/src/wchar/wcscmp_test.cpp +++ b/libc/test/src/wchar/wcscmp_test.cpp @@ -86,7 +86,7 @@ TEST(LlvmLibcWcscmpTest, StringArgumentSwapChangesSign) { ASSERT_LT(result, 0); } -#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER) +#if defined(LIBC_ADD_NULL_CHECKS) TEST(LlvmLibcWcscmpTest, NullptrCrash) { // Passing in a nullptr should crash the program. EXPECT_DEATH([] { LIBC_NAMESPACE::wcscmp(L"aaaaaaaaaaaaaa", nullptr); }, @@ -94,4 +94,4 @@ TEST(LlvmLibcWcscmpTest, NullptrCrash) { EXPECT_DEATH([] { LIBC_NAMESPACE::wcscmp(nullptr, L"aaaaaaaaaaaaaa"); }, WITH_SIGNAL(-1)); } -#endif // LIBC_HAS_ADDRESS_SANITIZER +#endif // LIBC_ADD_NULL_CHECKS diff --git a/libc/test/src/wchar/wcsdup_test.cpp b/libc/test/src/wchar/wcsdup_test.cpp new file mode 100644 index 0000000..eafbb2d --- /dev/null +++ b/libc/test/src/wchar/wcsdup_test.cpp @@ -0,0 +1,48 @@ +//===-- Unittests for wcsdup ----------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +#include "hdr/types/wchar_t.h" +#include "src/wchar/wcsdup.h" +#include "test/UnitTest/ErrnoCheckingTest.h" +#include "test/UnitTest/Test.h" + +using LlvmLibcWcsDupTest = LIBC_NAMESPACE::testing::ErrnoCheckingTest; + +TEST_F(LlvmLibcWcsDupTest, EmptyString) { + const wchar_t *empty = L""; + + wchar_t *result = LIBC_NAMESPACE::wcsdup(empty); + ASSERT_ERRNO_SUCCESS(); + + ASSERT_NE(result, static_cast<wchar_t *>(nullptr)); + ASSERT_NE(empty, const_cast<const wchar_t *>(result)); + ASSERT_TRUE(empty[0] == result[0]); + ::free(result); +} + +TEST_F(LlvmLibcWcsDupTest, AnyString) { + const wchar_t *abc = L"abc"; + + wchar_t *result = LIBC_NAMESPACE::wcsdup(abc); + ASSERT_ERRNO_SUCCESS(); + + ASSERT_NE(result, static_cast<wchar_t *>(nullptr)); + ASSERT_NE(abc, const_cast<const wchar_t *>(result)); + ASSERT_TRUE(abc[0] == result[0]); + ASSERT_TRUE(abc[1] == result[1]); + ASSERT_TRUE(abc[2] == result[2]); + ASSERT_TRUE(abc[3] == result[3]); + ::free(result); +} + +TEST_F(LlvmLibcWcsDupTest, NullPtr) { + wchar_t *result = LIBC_NAMESPACE::wcsdup(nullptr); + ASSERT_ERRNO_SUCCESS(); + + ASSERT_EQ(result, static_cast<wchar_t *>(nullptr)); +} diff --git a/libc/test/src/wchar/wcsncmp_test.cpp b/libc/test/src/wchar/wcsncmp_test.cpp index 28bbb52..c36c4db 100644 --- a/libc/test/src/wchar/wcsncmp_test.cpp +++ b/libc/test/src/wchar/wcsncmp_test.cpp @@ -93,7 +93,7 @@ TEST(LlvmLibcWcsncmpTest, StringArgumentSwapChangesSignWithSufficientLength) { ASSERT_LT(result, 0); } -#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER) +#if defined(LIBC_ADD_NULL_CHECKS) TEST(LlvmLibcWcsncmpTest, NullptrCrash) { // Passing in a nullptr should crash the program. EXPECT_DEATH([] { LIBC_NAMESPACE::wcsncmp(L"aaaaaaaaaaaaaa", nullptr, 3); }, @@ -101,7 +101,7 @@ TEST(LlvmLibcWcsncmpTest, NullptrCrash) { EXPECT_DEATH([] { LIBC_NAMESPACE::wcsncmp(nullptr, L"aaaaaaaaaaaaaa", 3); }, WITH_SIGNAL(-1)); } -#endif // LIBC_HAS_ADDRESS_SANITIZER +#endif // LIBC_ADD_NULL_CHECKS // This group is actually testing wcsncmp functionality diff --git a/libc/test/src/wchar/wcsnrtombs_test.cpp b/libc/test/src/wchar/wcsnrtombs_test.cpp new file mode 100644 index 0000000..04cf426 --- /dev/null +++ b/libc/test/src/wchar/wcsnrtombs_test.cpp @@ -0,0 +1,192 @@ +//===-- Unittests for wcsnrtombs ------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +#include "hdr/types/mbstate_t.h" +#include "src/__support/macros/null_check.h" +#include "src/string/memset.h" +#include "src/wchar/wcsnrtombs.h" +#include "test/UnitTest/ErrnoCheckingTest.h" +#include "test/UnitTest/Test.h" + +using LlvmLibcWcsnrtombs = LIBC_NAMESPACE::testing::ErrnoCheckingTest; + +// these tests are fairly simple as this function just calls into the internal +// wcsnrtombs which is more thoroughly tested + +TEST_F(LlvmLibcWcsnrtombs, AllMultibyteLengths) { + mbstate_t state; + LIBC_NAMESPACE::memset(&state, 0, sizeof(mbstate_t)); + + /// clown emoji, sigma symbol, y with diaeresis, letter A + const wchar_t src[] = {static_cast<wchar_t>(0x1f921), + static_cast<wchar_t>(0x2211), + static_cast<wchar_t>(0xff), static_cast<wchar_t>(0x41), + static_cast<wchar_t>(0x0)}; + const wchar_t *cur = src; + char mbs[11]; + + ASSERT_EQ(LIBC_NAMESPACE::wcsnrtombs(mbs, &cur, 5, 11, &state), + static_cast<size_t>(10)); + ASSERT_ERRNO_SUCCESS(); + ASSERT_EQ(cur, nullptr); + ASSERT_EQ(mbs[0], '\xF0'); // clown begin + ASSERT_EQ(mbs[1], '\x9F'); + ASSERT_EQ(mbs[2], '\xA4'); + ASSERT_EQ(mbs[3], '\xA1'); + ASSERT_EQ(mbs[4], '\xE2'); // sigma begin + ASSERT_EQ(mbs[5], '\x88'); + ASSERT_EQ(mbs[6], '\x91'); + ASSERT_EQ(mbs[7], '\xC3'); // y diaeresis begin + ASSERT_EQ(mbs[8], '\xBF'); + ASSERT_EQ(mbs[9], '\x41'); // A begin + ASSERT_EQ(mbs[10], '\0'); // null terminator +} + +TEST_F(LlvmLibcWcsnrtombs, DestLimit) { + mbstate_t state; + LIBC_NAMESPACE::memset(&state, 0, sizeof(mbstate_t)); + + /// clown emoji, sigma symbol, y with diaeresis, letter A + const wchar_t src[] = {static_cast<wchar_t>(0x1f921), + static_cast<wchar_t>(0x2211), + static_cast<wchar_t>(0xff), static_cast<wchar_t>(0x41), + static_cast<wchar_t>(0x0)}; + const wchar_t *cur = src; + + char mbs[11]; + LIBC_NAMESPACE::memset(mbs, '\x01', 11); // dummy initial values + + ASSERT_EQ(LIBC_NAMESPACE::wcsnrtombs(mbs, &cur, 5, 4, &state), + static_cast<size_t>(4)); + ASSERT_ERRNO_SUCCESS(); + ASSERT_EQ(cur, src + 1); + ASSERT_EQ(mbs[0], '\xF0'); + ASSERT_EQ(mbs[1], '\x9F'); + ASSERT_EQ(mbs[2], '\xA4'); + ASSERT_EQ(mbs[3], '\xA1'); + ASSERT_EQ(mbs[4], '\x01'); // didn't write more than 4 bytes + + LIBC_NAMESPACE::memset(mbs, '\x01', 11); // dummy initial values + LIBC_NAMESPACE::memset(&state, 0, sizeof(mbstate_t)); + cur = src; + + // not enough bytes to convert the second character, so only converts one + ASSERT_EQ(LIBC_NAMESPACE::wcsnrtombs(mbs, &cur, 5, 6, &state), + static_cast<size_t>(4)); + ASSERT_ERRNO_SUCCESS(); + ASSERT_EQ(cur, src + 1); + ASSERT_EQ(mbs[0], '\xF0'); + ASSERT_EQ(mbs[1], '\x9F'); + ASSERT_EQ(mbs[2], '\xA4'); + ASSERT_EQ(mbs[3], '\xA1'); + ASSERT_EQ(mbs[4], '\x01'); +} + +TEST(LlvmLibcWcsnrtombs, SrcLimit) { + mbstate_t state; + LIBC_NAMESPACE::memset(&state, 0, sizeof(mbstate_t)); + + /// clown emoji, sigma symbol, y with diaeresis, letter A + const wchar_t src[] = {static_cast<wchar_t>(0x1f921), + static_cast<wchar_t>(0x2211), + static_cast<wchar_t>(0xff), static_cast<wchar_t>(0x41), + static_cast<wchar_t>(0x0)}; + const wchar_t *cur = src; + + char mbs[11]; + LIBC_NAMESPACE::memset(mbs, '\x01', 11); // dummy initial values + + auto res = LIBC_NAMESPACE::wcsnrtombs(mbs, &cur, 2, 11, &state); + ASSERT_ERRNO_SUCCESS(); + ASSERT_EQ(res, static_cast<size_t>(7)); + ASSERT_EQ(cur, src + 2); + ASSERT_EQ(mbs[0], '\xF0'); // clown begin + ASSERT_EQ(mbs[1], '\x9F'); + ASSERT_EQ(mbs[2], '\xA4'); + ASSERT_EQ(mbs[3], '\xA1'); + ASSERT_EQ(mbs[4], '\xE2'); // sigma begin + ASSERT_EQ(mbs[5], '\x88'); + ASSERT_EQ(mbs[6], '\x91'); + ASSERT_EQ(mbs[7], '\x01'); + + res = LIBC_NAMESPACE::wcsnrtombs(mbs + res, &cur, 100, 11, &state); + ASSERT_ERRNO_SUCCESS(); + ASSERT_EQ(res, static_cast<size_t>(3)); + ASSERT_EQ(cur, nullptr); + ASSERT_EQ(mbs[0], '\xF0'); // clown begin + ASSERT_EQ(mbs[1], '\x9F'); + ASSERT_EQ(mbs[2], '\xA4'); + ASSERT_EQ(mbs[3], '\xA1'); + ASSERT_EQ(mbs[4], '\xE2'); // sigma begin + ASSERT_EQ(mbs[5], '\x88'); + ASSERT_EQ(mbs[6], '\x91'); + ASSERT_EQ(mbs[7], '\xC3'); // y diaeresis begin + ASSERT_EQ(mbs[8], '\xBF'); + ASSERT_EQ(mbs[9], '\x41'); // A begin + ASSERT_EQ(mbs[10], '\0'); // null terminator +} + +TEST_F(LlvmLibcWcsnrtombs, ErrnoTest) { + mbstate_t state; + LIBC_NAMESPACE::memset(&state, 0, sizeof(mbstate_t)); + + const wchar_t src[] = {static_cast<wchar_t>(0x1f921), + static_cast<wchar_t>(0x2211), + static_cast<wchar_t>(0x12ffff), // invalid widechar + static_cast<wchar_t>(0x0)}; + const wchar_t *cur = src; + char mbs[11]; + + // n parameter ignored when dest is null + ASSERT_EQ(LIBC_NAMESPACE::wcsnrtombs(mbs, &cur, 5, 7, &state), + static_cast<size_t>(7)); + ASSERT_ERRNO_SUCCESS(); + + LIBC_NAMESPACE::memset(&state, 0, sizeof(mbstate_t)); + ASSERT_EQ(LIBC_NAMESPACE::wcsnrtombs(mbs, &cur, 5, 100, &state), + static_cast<size_t>(-1)); + ASSERT_ERRNO_EQ(EILSEQ); +} + +TEST_F(LlvmLibcWcsnrtombs, NullState) { + // this test is the same as DestLimit except it uses a nullptr mbstate* + + /// clown emoji, sigma symbol, y with diaeresis, letter A + const wchar_t src[] = {static_cast<wchar_t>(0x1f921), + static_cast<wchar_t>(0x2211), + static_cast<wchar_t>(0xff), static_cast<wchar_t>(0x41), + static_cast<wchar_t>(0x0)}; + const wchar_t *cur = src; + + char mbs[11]; + LIBC_NAMESPACE::memset(mbs, '\x01', 11); // dummy initial values + + ASSERT_EQ(LIBC_NAMESPACE::wcsnrtombs(mbs, &cur, 5, 4, nullptr), + static_cast<size_t>(4)); + ASSERT_ERRNO_SUCCESS(); + ASSERT_EQ(cur, src + 1); + ASSERT_EQ(mbs[0], '\xF0'); + ASSERT_EQ(mbs[1], '\x9F'); + ASSERT_EQ(mbs[2], '\xA4'); + ASSERT_EQ(mbs[3], '\xA1'); + ASSERT_EQ(mbs[4], '\x01'); // didn't write more than 4 bytes + + LIBC_NAMESPACE::memset(mbs, '\x01', 11); // dummy initial values + + // not enough bytes to convert the second character, so only converts one + cur = src; + ASSERT_EQ(LIBC_NAMESPACE::wcsnrtombs(mbs, &cur, 5, 6, nullptr), + static_cast<size_t>(4)); + ASSERT_ERRNO_SUCCESS(); + ASSERT_EQ(cur, src + 1); + ASSERT_EQ(mbs[0], '\xF0'); + ASSERT_EQ(mbs[1], '\x9F'); + ASSERT_EQ(mbs[2], '\xA4'); + ASSERT_EQ(mbs[3], '\xA1'); + ASSERT_EQ(mbs[4], '\x01'); +} diff --git a/libc/test/src/wchar/wcspbrk_test.cpp b/libc/test/src/wchar/wcspbrk_test.cpp index bca9bff..4c85ca4 100644 --- a/libc/test/src/wchar/wcspbrk_test.cpp +++ b/libc/test/src/wchar/wcspbrk_test.cpp @@ -61,7 +61,7 @@ TEST(LlvmLibcWCSPBrkTest, FindsFirstInBreakset) { EXPECT_EQ(LIBC_NAMESPACE::wcspbrk(src, L"43"), src + 2); } -#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER) +#if defined(LIBC_ADD_NULL_CHECKS) TEST(LlvmLibcWCSPBrkTest, NullptrCrash) { // Passing in a nullptr should crash the program. EXPECT_DEATH([] { LIBC_NAMESPACE::wcspbrk(L"aaaaaaaaaaaaaa", nullptr); }, @@ -69,4 +69,4 @@ TEST(LlvmLibcWCSPBrkTest, NullptrCrash) { EXPECT_DEATH([] { LIBC_NAMESPACE::wcspbrk(nullptr, L"aaaaaaaaaaaaaa"); }, WITH_SIGNAL(-1)); } -#endif // LIBC_HAS_ADDRESS_SANITIZER +#endif // LIBC_ADD_NULL_CHECKS diff --git a/libc/test/src/wchar/wcsrchr_test.cpp b/libc/test/src/wchar/wcsrchr_test.cpp index 707dfb6..52c28ac 100644 --- a/libc/test/src/wchar/wcsrchr_test.cpp +++ b/libc/test/src/wchar/wcsrchr_test.cpp @@ -60,9 +60,9 @@ TEST(LlvmLibcWCSRChrTest, EmptyStringShouldOnlyMatchNullTerminator) { ASSERT_EQ(LIBC_NAMESPACE::wcsrchr(src, L'*'), nullptr); } -#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER) +#if defined(LIBC_ADD_NULL_CHECKS) TEST(LlvmLibcWCSRChrTest, NullptrCrash) { // Passing in a nullptr should crash the program. EXPECT_DEATH([] { LIBC_NAMESPACE::wcsrchr(nullptr, L'a'); }, WITH_SIGNAL(-1)); } -#endif // LIBC_HAS_ADDRESS_SANITIZER +#endif // LIBC_ADD_NULL_CHECKS diff --git a/libc/test/src/wchar/wcsrtombs_test.cpp b/libc/test/src/wchar/wcsrtombs_test.cpp new file mode 100644 index 0000000..65c69e6 --- /dev/null +++ b/libc/test/src/wchar/wcsrtombs_test.cpp @@ -0,0 +1,150 @@ +//===-- Unittests for wcsrtombs -------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +#include "hdr/types/mbstate_t.h" +#include "src/__support/macros/null_check.h" +#include "src/string/memset.h" +#include "src/wchar/wcsrtombs.h" +#include "test/UnitTest/ErrnoCheckingTest.h" +#include "test/UnitTest/Test.h" + +using LlvmLibcWcsrtombs = LIBC_NAMESPACE::testing::ErrnoCheckingTest; + +// these tests are fairly simple as this function just calls into the internal +// wcsnrtombs which is more thoroughly tested + +TEST_F(LlvmLibcWcsrtombs, AllMultibyteLengths) { + mbstate_t state; + LIBC_NAMESPACE::memset(&state, 0, sizeof(mbstate_t)); + + /// clown emoji, sigma symbol, y with diaeresis, letter A + const wchar_t src[] = {static_cast<wchar_t>(0x1f921), + static_cast<wchar_t>(0x2211), + static_cast<wchar_t>(0xff), static_cast<wchar_t>(0x41), + static_cast<wchar_t>(0x0)}; + const wchar_t *cur = src; + char mbs[11]; + + ASSERT_EQ(LIBC_NAMESPACE::wcsrtombs(mbs, &cur, 11, &state), + static_cast<size_t>(10)); + ASSERT_ERRNO_SUCCESS(); + ASSERT_EQ(cur, nullptr); + ASSERT_EQ(mbs[0], '\xF0'); // clown begin + ASSERT_EQ(mbs[1], '\x9F'); + ASSERT_EQ(mbs[2], '\xA4'); + ASSERT_EQ(mbs[3], '\xA1'); + ASSERT_EQ(mbs[4], '\xE2'); // sigma begin + ASSERT_EQ(mbs[5], '\x88'); + ASSERT_EQ(mbs[6], '\x91'); + ASSERT_EQ(mbs[7], '\xC3'); // y diaeresis begin + ASSERT_EQ(mbs[8], '\xBF'); + ASSERT_EQ(mbs[9], '\x41'); // A begin + ASSERT_EQ(mbs[10], '\0'); // null terminator +} + +TEST_F(LlvmLibcWcsrtombs, DestLimit) { + mbstate_t state; + LIBC_NAMESPACE::memset(&state, 0, sizeof(mbstate_t)); + + /// clown emoji, sigma symbol, y with diaeresis, letter A + const wchar_t src[] = {static_cast<wchar_t>(0x1f921), + static_cast<wchar_t>(0x2211), + static_cast<wchar_t>(0xff), static_cast<wchar_t>(0x41), + static_cast<wchar_t>(0x0)}; + const wchar_t *cur = src; + + char mbs[11]; + LIBC_NAMESPACE::memset(mbs, '\x01', 11); // dummy initial values + + ASSERT_EQ(LIBC_NAMESPACE::wcsrtombs(mbs, &cur, 4, &state), + static_cast<size_t>(4)); + ASSERT_ERRNO_SUCCESS(); + ASSERT_EQ(cur, src + 1); + ASSERT_EQ(mbs[0], '\xF0'); + ASSERT_EQ(mbs[1], '\x9F'); + ASSERT_EQ(mbs[2], '\xA4'); + ASSERT_EQ(mbs[3], '\xA1'); + ASSERT_EQ(mbs[4], '\x01'); // didn't write more than 4 bytes + + LIBC_NAMESPACE::memset(mbs, '\x01', 11); // dummy initial values + LIBC_NAMESPACE::memset(&state, 0, sizeof(mbstate_t)); + + // not enough bytes to convert the second character, so only converts one + cur = src; + ASSERT_EQ(LIBC_NAMESPACE::wcsrtombs(mbs, &cur, 6, &state), + static_cast<size_t>(4)); + ASSERT_ERRNO_SUCCESS(); + ASSERT_EQ(cur, src + 1); + ASSERT_EQ(mbs[0], '\xF0'); + ASSERT_EQ(mbs[1], '\x9F'); + ASSERT_EQ(mbs[2], '\xA4'); + ASSERT_EQ(mbs[3], '\xA1'); + ASSERT_EQ(mbs[4], '\x01'); +} + +TEST_F(LlvmLibcWcsrtombs, ErrnoTest) { + mbstate_t state; + LIBC_NAMESPACE::memset(&state, 0, sizeof(mbstate_t)); + + const wchar_t src[] = {static_cast<wchar_t>(0x1f921), + static_cast<wchar_t>(0x2211), + static_cast<wchar_t>(0x12ffff), // invalid widechar + static_cast<wchar_t>(0x0)}; + const wchar_t *cur = src; + char mbs[11]; + + // n parameter ignored when dest is null + ASSERT_EQ(LIBC_NAMESPACE::wcsrtombs(mbs, &cur, 7, &state), + static_cast<size_t>(7)); + ASSERT_ERRNO_SUCCESS(); + + LIBC_NAMESPACE::memset(&state, 0, sizeof(mbstate_t)); + cur = src; + + ASSERT_EQ(LIBC_NAMESPACE::wcsrtombs(mbs, &cur, 100, &state), + static_cast<size_t>(-1)); + ASSERT_ERRNO_EQ(EILSEQ); +} + +TEST_F(LlvmLibcWcsrtombs, NullState) { + // this test is the same as DestLimit except it uses a nullptr mbstate* + + /// clown emoji, sigma symbol, y with diaeresis, letter A + const wchar_t src[] = {static_cast<wchar_t>(0x1f921), + static_cast<wchar_t>(0x2211), + static_cast<wchar_t>(0xff), static_cast<wchar_t>(0x41), + static_cast<wchar_t>(0x0)}; + const wchar_t *cur = src; + + char mbs[11]; + LIBC_NAMESPACE::memset(mbs, '\x01', 11); // dummy initial values + + ASSERT_EQ(LIBC_NAMESPACE::wcsrtombs(mbs, &cur, 4, nullptr), + static_cast<size_t>(4)); + ASSERT_ERRNO_SUCCESS(); + ASSERT_EQ(cur, src + 1); + ASSERT_EQ(mbs[0], '\xF0'); + ASSERT_EQ(mbs[1], '\x9F'); + ASSERT_EQ(mbs[2], '\xA4'); + ASSERT_EQ(mbs[3], '\xA1'); + ASSERT_EQ(mbs[4], '\x01'); // didn't write more than 4 bytes + + LIBC_NAMESPACE::memset(mbs, '\x01', 11); // dummy initial values + + // not enough bytes to convert the second character, so only converts one + cur = src; + ASSERT_EQ(LIBC_NAMESPACE::wcsrtombs(mbs, &cur, 6, nullptr), + static_cast<size_t>(4)); + ASSERT_ERRNO_SUCCESS(); + ASSERT_EQ(cur, src + 1); + ASSERT_EQ(mbs[0], '\xF0'); + ASSERT_EQ(mbs[1], '\x9F'); + ASSERT_EQ(mbs[2], '\xA4'); + ASSERT_EQ(mbs[3], '\xA1'); + ASSERT_EQ(mbs[4], '\x01'); +} diff --git a/libc/test/src/wchar/wcstol_test.cpp b/libc/test/src/wchar/wcstol_test.cpp index 9ae32ba..2dd0bc7 100644 --- a/libc/test/src/wchar/wcstol_test.cpp +++ b/libc/test/src/wchar/wcstol_test.cpp @@ -12,4 +12,4 @@ #include "WcstolTest.h" -WCSTOL_TEST(Wcstol, LIBC_NAMESPACE::wcstol)
\ No newline at end of file +WCSTOL_TEST(Wcstol, LIBC_NAMESPACE::wcstol) diff --git a/libc/test/src/wchar/wcstoll_test.cpp b/libc/test/src/wchar/wcstoll_test.cpp index c24c1f6..00a241a 100644 --- a/libc/test/src/wchar/wcstoll_test.cpp +++ b/libc/test/src/wchar/wcstoll_test.cpp @@ -12,4 +12,4 @@ #include "WcstolTest.h" -WCSTOL_TEST(Wcstoll, LIBC_NAMESPACE::wcstoll)
\ No newline at end of file +WCSTOL_TEST(Wcstoll, LIBC_NAMESPACE::wcstoll) diff --git a/libc/test/src/wchar/wcstombs_test.cpp b/libc/test/src/wchar/wcstombs_test.cpp new file mode 100644 index 0000000..61e0873 --- /dev/null +++ b/libc/test/src/wchar/wcstombs_test.cpp @@ -0,0 +1,84 @@ +//===-- Unittests for wcstombs --------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +#include "src/wchar/wcstombs.h" +#include "test/UnitTest/ErrnoCheckingTest.h" +#include "test/UnitTest/Test.h" + +using LlvmLibcWcstombs = LIBC_NAMESPACE::testing::ErrnoCheckingTest; + +// these tests are fairly simple as this function just calls into the internal +// wcsnrtombs which is more thoroughly tested + +TEST_F(LlvmLibcWcstombs, AllMultibyteLengths) { + /// clown emoji, sigma symbol, y with diaeresis, letter A + const wchar_t src[] = {static_cast<wchar_t>(0x1f921), + static_cast<wchar_t>(0x2211), + static_cast<wchar_t>(0xff), static_cast<wchar_t>(0x41), + static_cast<wchar_t>(0x0)}; + char mbs[11]; + + ASSERT_EQ(LIBC_NAMESPACE::wcstombs(mbs, src, 11), static_cast<size_t>(10)); + ASSERT_ERRNO_SUCCESS(); + ASSERT_EQ(mbs[0], '\xF0'); // clown begin + ASSERT_EQ(mbs[1], '\x9F'); + ASSERT_EQ(mbs[2], '\xA4'); + ASSERT_EQ(mbs[3], '\xA1'); + ASSERT_EQ(mbs[4], '\xE2'); // sigma begin + ASSERT_EQ(mbs[5], '\x88'); + ASSERT_EQ(mbs[6], '\x91'); + ASSERT_EQ(mbs[7], '\xC3'); // y diaeresis begin + ASSERT_EQ(mbs[8], '\xBF'); + ASSERT_EQ(mbs[9], '\x41'); // A begin + ASSERT_EQ(mbs[10], '\0'); // null terminator +} + +TEST_F(LlvmLibcWcstombs, DestLimit) { + /// clown emoji, sigma symbol, y with diaeresis, letter A + const wchar_t src[] = {static_cast<wchar_t>(0x1f921), + static_cast<wchar_t>(0x2211), + static_cast<wchar_t>(0xff), static_cast<wchar_t>(0x41), + static_cast<wchar_t>(0x0)}; + char mbs[11]; + for (int i = 0; i < 11; ++i) + mbs[i] = '\x01'; // dummy initial values + + ASSERT_EQ(LIBC_NAMESPACE::wcstombs(mbs, src, 4), static_cast<size_t>(4)); + ASSERT_ERRNO_SUCCESS(); + ASSERT_EQ(mbs[0], '\xF0'); + ASSERT_EQ(mbs[1], '\x9F'); + ASSERT_EQ(mbs[2], '\xA4'); + ASSERT_EQ(mbs[3], '\xA1'); + ASSERT_EQ(mbs[4], '\x01'); // didn't write more than 4 bytes + + for (int i = 0; i < 11; ++i) + mbs[i] = '\x01'; // dummy initial values + + // not enough bytes to convert the second character, so only converts one + ASSERT_EQ(LIBC_NAMESPACE::wcstombs(mbs, src, 6), static_cast<size_t>(4)); + ASSERT_ERRNO_SUCCESS(); + ASSERT_EQ(mbs[0], '\xF0'); + ASSERT_EQ(mbs[1], '\x9F'); + ASSERT_EQ(mbs[2], '\xA4'); + ASSERT_EQ(mbs[3], '\xA1'); + ASSERT_EQ(mbs[4], '\x01'); +} + +TEST_F(LlvmLibcWcstombs, ErrnoTest) { + const wchar_t src[] = {static_cast<wchar_t>(0x1f921), + static_cast<wchar_t>(0x2211), + static_cast<wchar_t>(0x12ffff), // invalid widechar + static_cast<wchar_t>(0x0)}; + char mbs[11]; + + // n parameter ignored when dest is null + ASSERT_EQ(LIBC_NAMESPACE::wcstombs(mbs, src, 7), static_cast<size_t>(7)); + ASSERT_ERRNO_SUCCESS(); + ASSERT_EQ(LIBC_NAMESPACE::wcstombs(mbs, src, 100), static_cast<size_t>(-1)); + ASSERT_ERRNO_EQ(EILSEQ); +} diff --git a/libc/test/src/wchar/wcstoul_test.cpp b/libc/test/src/wchar/wcstoul_test.cpp index ab0afb9..63b630d 100644 --- a/libc/test/src/wchar/wcstoul_test.cpp +++ b/libc/test/src/wchar/wcstoul_test.cpp @@ -12,4 +12,4 @@ #include "WcstolTest.h" -WCSTOL_TEST(Wcstoul, LIBC_NAMESPACE::wcstoul)
\ No newline at end of file +WCSTOL_TEST(Wcstoul, LIBC_NAMESPACE::wcstoul) diff --git a/libc/test/src/wchar/wcstoull_test.cpp b/libc/test/src/wchar/wcstoull_test.cpp index adba4f1..12895d3 100644 --- a/libc/test/src/wchar/wcstoull_test.cpp +++ b/libc/test/src/wchar/wcstoull_test.cpp @@ -12,4 +12,4 @@ #include "WcstolTest.h" -WCSTOL_TEST(Wcstoull, LIBC_NAMESPACE::wcstoull)
\ No newline at end of file +WCSTOL_TEST(Wcstoull, LIBC_NAMESPACE::wcstoull) diff --git a/libc/test/src/wchar/wmemcmp_test.cpp b/libc/test/src/wchar/wmemcmp_test.cpp index 5b07ca7..c9c0839 100644 --- a/libc/test/src/wchar/wmemcmp_test.cpp +++ b/libc/test/src/wchar/wmemcmp_test.cpp @@ -67,7 +67,7 @@ TEST(LlvmLibcWMemcmpTest, LhsRhsAreTheSameLong) { EXPECT_EQ(LIBC_NAMESPACE::wmemcmp(lhs, rhs, 15), 0); } -#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER) +#if defined(LIBC_ADD_NULL_CHECKS) TEST(LlvmLibcWMemcmpTest, NullptrCrash) { // Passing in a nullptr should crash the program. EXPECT_DEATH([] { LIBC_NAMESPACE::wmemcmp(L"aaaaaaaaaaaaaa", nullptr, 15); }, @@ -75,4 +75,4 @@ TEST(LlvmLibcWMemcmpTest, NullptrCrash) { EXPECT_DEATH([] { LIBC_NAMESPACE::wmemcmp(nullptr, L"aaaaaaaaaaaaaa", 15); }, WITH_SIGNAL(-1)); } -#endif // LIBC_HAS_ADDRESS_SANITIZER +#endif // LIBC_ADD_NULL_CHECKS diff --git a/libc/test/src/wchar/wmemmove_test.cpp b/libc/test/src/wchar/wmemmove_test.cpp index d23aa0f..102fc04 100644 --- a/libc/test/src/wchar/wmemmove_test.cpp +++ b/libc/test/src/wchar/wmemmove_test.cpp @@ -99,7 +99,7 @@ TEST(LlvmLibcWMemmoveTest, DstFollowSrc) { EXPECT_TRUE(buffer[3] == expected[3]); } -#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER) +#if defined(LIBC_ADD_NULL_CHECKS) TEST(LlvmLibcWMemmoveTest, NullptrCrash) { wchar_t buffer[] = {L'a', L'b'}; // Passing in a nullptr should crash the program. @@ -108,4 +108,4 @@ TEST(LlvmLibcWMemmoveTest, NullptrCrash) { EXPECT_DEATH([&buffer] { LIBC_NAMESPACE::wmemmove(nullptr, buffer, 2); }, WITH_SIGNAL(-1)); } -#endif // LIBC_HAS_ADDRESS_SANITIZER +#endif // LIBC_ADD_NULL_CHECKS |