[libcxx-commits] [libcxx] 8f972cb - [libc++][nfc] Add TEST_HAS_NO_INT128.
Mark de Wever via libcxx-commits
libcxx-commits at lists.llvm.org
Thu Jan 27 08:31:36 PST 2022
Author: Mark de Wever
Date: 2022-01-27T17:31:27+01:00
New Revision: 8f972cb0fd0cf2513a1134a5f37b3c059376ca47
URL: https://github.com/llvm/llvm-project/commit/8f972cb0fd0cf2513a1134a5f37b3c059376ca47
DIFF: https://github.com/llvm/llvm-project/commit/8f972cb0fd0cf2513a1134a5f37b3c059376ca47.diff
LOG: [libc++][nfc] Add TEST_HAS_NO_INT128.
Avoid using the libc++ internal `_LIBCPP_HAS_NO_INT128` in our tests.
Reviewed By: #libc, ldionne
Differential Revision: https://reviews.llvm.org/D117992
Added:
Modified:
libcxx/test/libcxx/algorithms/half_positive.pass.cpp
libcxx/test/libcxx/numerics/numeric.ops/midpoint.integer.pass.cpp
libcxx/test/libcxx/type_traits/convert_to_integral.pass.cpp
libcxx/test/libcxx/utilities/format/format.arguments/format.arg/visit_format_arg.pass.cpp
libcxx/test/libcxx/utilities/format/format.arguments/format.args/get.pass.cpp
libcxx/test/std/concepts/concepts.lang/concept.common/common_with.compile.pass.cpp
libcxx/test/std/concepts/concepts.lang/concept.commonref/common_reference.compile.pass.cpp
libcxx/test/std/concepts/concepts.lang/concepts.arithmetic/integral.pass.cpp
libcxx/test/std/concepts/concepts.lang/concepts.arithmetic/signed_integral.pass.cpp
libcxx/test/std/concepts/concepts.lang/concepts.arithmetic/unsigned_integral.pass.cpp
libcxx/test/std/language.support/cmp/cmp.concept/three_way_comparable.compile.pass.cpp
libcxx/test/std/language.support/support.limits/limits/is_specialized.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/const_data_members.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/denorm_min.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/digits.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/digits10.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/epsilon.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_denorm.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_denorm_loss.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_infinity.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_quiet_NaN.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_signaling_NaN.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/infinity.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_bounded.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_exact.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_iec559.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_integer.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_modulo.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_signed.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/lowest.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/max.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/max_digits10.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/max_exponent.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/max_exponent10.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/min.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/min_exponent.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/min_exponent10.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/quiet_NaN.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/radix.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/round_error.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/round_style.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/signaling_NaN.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/tinyness_before.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/traps.pass.cpp
libcxx/test/std/numerics/bit/bit.pow.two/bit_ceil.pass.cpp
libcxx/test/std/numerics/bit/bit.pow.two/bit_floor.pass.cpp
libcxx/test/std/numerics/bit/bit.pow.two/bit_width.pass.cpp
libcxx/test/std/numerics/bit/bit.pow.two/has_single_bit.pass.cpp
libcxx/test/std/numerics/bit/bitops.count/countl_one.pass.cpp
libcxx/test/std/numerics/bit/bitops.count/countl_zero.pass.cpp
libcxx/test/std/numerics/bit/bitops.count/countr_one.pass.cpp
libcxx/test/std/numerics/bit/bitops.count/countr_zero.pass.cpp
libcxx/test/std/numerics/bit/bitops.count/popcount.pass.cpp
libcxx/test/std/numerics/bit/bitops.rot/rotl.pass.cpp
libcxx/test/std/numerics/bit/bitops.rot/rotr.pass.cpp
libcxx/test/std/numerics/bit/byteswap.pass.cpp
libcxx/test/std/numerics/numeric.ops/numeric.ops.midpoint/midpoint.integer.pass.cpp
libcxx/test/std/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/eval.pass.cpp
libcxx/test/std/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/int128.pass.cpp
libcxx/test/std/numerics/rand/rand.req/rand.req.urng/uniform_random_bit_generator.compile.pass.cpp
libcxx/test/std/utilities/format/format.formatter/format.context/format.formatter.spec/formatter.signed_integral.pass.cpp
libcxx/test/std/utilities/format/format.formatter/format.context/format.formatter.spec/formatter.unsigned_integral.pass.cpp
libcxx/test/std/utilities/format/format.formatter/format.context/types.compile.pass.cpp
libcxx/test/std/utilities/format/format.functions/format_tests.h
libcxx/test/std/utilities/function.objects/unord.hash/integral.pass.cpp
libcxx/test/std/utilities/meta/meta.trans/meta.trans.sign/make_signed.pass.cpp
libcxx/test/std/utilities/meta/meta.trans/meta.trans.sign/make_unsigned.pass.cpp
libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/integral.pass.cpp
libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/integral.pass.cpp
libcxx/test/std/utilities/meta/meta.unary/meta.unary.prop/is_signed.pass.cpp
libcxx/test/std/utilities/meta/meta.unary/meta.unary.prop/is_unsigned.pass.cpp
libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_equal/cmp_equal.pass.cpp
libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_greater/cmp_greater.pass.cpp
libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_greater_equal/cmp_greater_equal.pass.cpp
libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_less/cmp_less.pass.cpp
libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_less_equal/cmp_less_equal.pass.cpp
libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_not_equal/cmp_not_equal.pass.cpp
libcxx/test/std/utilities/utility/utility.intcmp/intcmp.in_range/in_range.pass.cpp
libcxx/test/support/msvc_stdlib_force_include.h
libcxx/test/support/poisoned_hash_helper.h
libcxx/test/support/test_macros.h
Removed:
################################################################################
diff --git a/libcxx/test/libcxx/algorithms/half_positive.pass.cpp b/libcxx/test/libcxx/algorithms/half_positive.pass.cpp
index fd7d1413741c4..997679629dac6 100644
--- a/libcxx/test/libcxx/algorithms/half_positive.pass.cpp
+++ b/libcxx/test/libcxx/algorithms/half_positive.pass.cpp
@@ -36,9 +36,9 @@ int main(int, char**)
assert(test<long>());
assert((test<UserDefinedIntegral<int>, int>()));
assert(test<size_t>());
-#if !defined(_LIBCPP_HAS_NO_INT128)
+#if !defined(TEST_HAS_NO_INT128)
assert(test<__int128_t>());
-#endif // !defined(_LIBCPP_HAS_NO_INT128)
+#endif // !defined(TEST_HAS_NO_INT128)
}
#if TEST_STD_VER >= 11
@@ -47,9 +47,9 @@ int main(int, char**)
static_assert(test<int>(), "");
static_assert(test<long>(), "");
static_assert(test<size_t>(), "");
-#if !defined(_LIBCPP_HAS_NO_INT128)
+#if !defined(TEST_HAS_NO_INT128)
static_assert(test<__int128_t>(), "");
-#endif // !defined(_LIBCPP_HAS_NO_INT128)
+#endif // !defined(TEST_HAS_NO_INT128)
}
#endif // TEST_STD_VER >= 11
diff --git a/libcxx/test/libcxx/numerics/numeric.ops/midpoint.integer.pass.cpp b/libcxx/test/libcxx/numerics/numeric.ops/midpoint.integer.pass.cpp
index 53dda1f007e21..d0495df4b415a 100644
--- a/libcxx/test/libcxx/numerics/numeric.ops/midpoint.integer.pass.cpp
+++ b/libcxx/test/libcxx/numerics/numeric.ops/midpoint.integer.pass.cpp
@@ -53,7 +53,7 @@ int main(int, char**)
test<uint32_t>();
test<uint64_t>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__int128_t>();
test<__uint128_t>();
#endif
diff --git a/libcxx/test/libcxx/type_traits/convert_to_integral.pass.cpp b/libcxx/test/libcxx/type_traits/convert_to_integral.pass.cpp
index d8fce1e1414ce..fd7db18f2dcee 100644
--- a/libcxx/test/libcxx/type_traits/convert_to_integral.pass.cpp
+++ b/libcxx/test/libcxx/type_traits/convert_to_integral.pass.cpp
@@ -107,7 +107,7 @@ int main(int, char**)
check_integral_types<unsigned long, unsigned long>();
check_integral_types<long long, long long>();
check_integral_types<unsigned long long, unsigned long long>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
check_integral_types<__int128_t, __int128_t>();
check_integral_types<__uint128_t, __uint128_t>();
#endif
diff --git a/libcxx/test/libcxx/utilities/format/format.arguments/format.arg/visit_format_arg.pass.cpp b/libcxx/test/libcxx/utilities/format/format.arguments/format.arg/visit_format_arg.pass.cpp
index 7a534d7282ef7..3f10ab06adfc2 100644
--- a/libcxx/test/libcxx/utilities/format/format.arguments/format.arg/visit_format_arg.pass.cpp
+++ b/libcxx/test/libcxx/utilities/format/format.arguments/format.arg/visit_format_arg.pass.cpp
@@ -181,7 +181,7 @@ void test() {
test<Context, long long, long long>(std::numeric_limits<long>::max());
test<Context, long long, long long>(std::numeric_limits<long long>::max());
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<Context, __int128_t, __int128_t>(std::numeric_limits<__int128_t>::min());
test<Context, __int128_t, __int128_t>(std::numeric_limits<long long>::min());
test<Context, __int128_t, __int128_t>(std::numeric_limits<long>::min());
@@ -242,7 +242,7 @@ void test() {
test<Context, unsigned long long, unsigned long long>(
std::numeric_limits<unsigned long long>::max());
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<Context, __uint128_t, __uint128_t>(0);
test<Context, __uint128_t, __uint128_t>(
std::numeric_limits<unsigned char>::max());
diff --git a/libcxx/test/libcxx/utilities/format/format.arguments/format.args/get.pass.cpp b/libcxx/test/libcxx/utilities/format/format.arguments/format.args/get.pass.cpp
index da02e6961012c..924818f94e4b0 100644
--- a/libcxx/test/libcxx/utilities/format/format.arguments/format.args/get.pass.cpp
+++ b/libcxx/test/libcxx/utilities/format/format.arguments/format.args/get.pass.cpp
@@ -172,7 +172,7 @@ void test() {
test<Context, long long, long long>(std::numeric_limits<long>::max());
test<Context, long long, long long>(std::numeric_limits<long long>::max());
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<Context, __int128_t, __int128_t>(std::numeric_limits<__int128_t>::min());
test<Context, __int128_t, __int128_t>(std::numeric_limits<long long>::min());
test<Context, __int128_t, __int128_t>(std::numeric_limits<long>::min());
@@ -233,7 +233,7 @@ void test() {
test<Context, unsigned long long, unsigned long long>(
std::numeric_limits<unsigned long long>::max());
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<Context, __uint128_t, __uint128_t>(0);
test<Context, __uint128_t, __uint128_t>(
std::numeric_limits<unsigned char>::max());
diff --git a/libcxx/test/std/concepts/concepts.lang/concept.common/common_with.compile.pass.cpp b/libcxx/test/std/concepts/concepts.lang/concept.common/common_with.compile.pass.cpp
index 7bbf6865bf321..935bf7cc93eeb 100644
--- a/libcxx/test/std/concepts/concepts.lang/concept.common/common_with.compile.pass.cpp
+++ b/libcxx/test/std/concepts/concepts.lang/concept.common/common_with.compile.pass.cpp
@@ -60,7 +60,7 @@ static_assert(std::common_with<void, void>);
static_assert(CheckCommonWith<int, int>());
static_assert(CheckCommonWith<int, long>());
static_assert(CheckCommonWith<int, unsigned char>());
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
static_assert(CheckCommonWith<int, __int128_t>());
#endif
static_assert(CheckCommonWith<int, double>());
diff --git a/libcxx/test/std/concepts/concepts.lang/concept.commonref/common_reference.compile.pass.cpp b/libcxx/test/std/concepts/concepts.lang/concept.commonref/common_reference.compile.pass.cpp
index 70a674ea8524c..139cccd39c3be 100644
--- a/libcxx/test/std/concepts/concepts.lang/concept.commonref/common_reference.compile.pass.cpp
+++ b/libcxx/test/std/concepts/concepts.lang/concept.commonref/common_reference.compile.pass.cpp
@@ -54,7 +54,7 @@ static_assert(std::common_reference_with<void, void>);
static_assert(CheckCommonReferenceWith<int, int>());
static_assert(CheckCommonReferenceWith<int, long>());
static_assert(CheckCommonReferenceWith<int, unsigned char>());
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
static_assert(CheckCommonReferenceWith<int, __int128_t>());
#endif
static_assert(CheckCommonReferenceWith<int, double>());
diff --git a/libcxx/test/std/concepts/concepts.lang/concepts.arithmetic/integral.pass.cpp b/libcxx/test/std/concepts/concepts.lang/concepts.arithmetic/integral.pass.cpp
index cb9c4353a8c75..796f05a5ef307 100644
--- a/libcxx/test/std/concepts/concepts.lang/concepts.arithmetic/integral.pass.cpp
+++ b/libcxx/test/std/concepts/concepts.lang/concepts.arithmetic/integral.pass.cpp
@@ -60,7 +60,7 @@ static_assert(CheckIntegralQualifiers<long long>());
static_assert(CheckIntegralQualifiers<unsigned long long>());
// extended integers
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
static_assert(CheckIntegralQualifiers<__int128_t>());
static_assert(CheckIntegralQualifiers<__uint128_t>());
#endif
diff --git a/libcxx/test/std/concepts/concepts.lang/concepts.arithmetic/signed_integral.pass.cpp b/libcxx/test/std/concepts/concepts.lang/concepts.arithmetic/signed_integral.pass.cpp
index 4092ab9c2d1a1..ded45feabad80 100644
--- a/libcxx/test/std/concepts/concepts.lang/concepts.arithmetic/signed_integral.pass.cpp
+++ b/libcxx/test/std/concepts/concepts.lang/concepts.arithmetic/signed_integral.pass.cpp
@@ -74,7 +74,7 @@ static_assert(!CheckSignedIntegralQualifiers<unsigned long>());
static_assert(!CheckSignedIntegralQualifiers<unsigned long long>());
// extended integers
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
static_assert(CheckSignedIntegralQualifiers<__int128_t>());
static_assert(!CheckSignedIntegralQualifiers<__uint128_t>());
#endif
diff --git a/libcxx/test/std/concepts/concepts.lang/concepts.arithmetic/unsigned_integral.pass.cpp b/libcxx/test/std/concepts/concepts.lang/concepts.arithmetic/unsigned_integral.pass.cpp
index f390f452bbf2e..2d6ccc7ee93fb 100644
--- a/libcxx/test/std/concepts/concepts.lang/concepts.arithmetic/unsigned_integral.pass.cpp
+++ b/libcxx/test/std/concepts/concepts.lang/concepts.arithmetic/unsigned_integral.pass.cpp
@@ -69,7 +69,7 @@ static_assert(CheckUnsignedIntegralQualifiers<char32_t>() ==
!std::is_signed_v<char32_t>);
// extended integers
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
static_assert(CheckUnsignedIntegralQualifiers<__uint128_t>());
static_assert(!CheckUnsignedIntegralQualifiers<__int128_t>());
#endif
diff --git a/libcxx/test/std/language.support/cmp/cmp.concept/three_way_comparable.compile.pass.cpp b/libcxx/test/std/language.support/cmp/cmp.concept/three_way_comparable.compile.pass.cpp
index 5ff5213d303be..85566b4c59fd9 100644
--- a/libcxx/test/std/language.support/cmp/cmp.concept/three_way_comparable.compile.pass.cpp
+++ b/libcxx/test/std/language.support/cmp/cmp.concept/three_way_comparable.compile.pass.cpp
@@ -34,7 +34,7 @@ static_assert(std::three_way_comparable<char8_t const&>);
static_assert(std::three_way_comparable<char16_t volatile&>);
static_assert(std::three_way_comparable<char32_t const volatile&>);
#endif
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
static_assert(std::three_way_comparable<__int128_t const&>);
static_assert(std::three_way_comparable<__uint128_t const&>);
#endif
diff --git a/libcxx/test/std/language.support/support.limits/limits/is_specialized.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/is_specialized.pass.cpp
index b5acfbe1c71a6..e0145b53bbfcc 100644
--- a/libcxx/test/std/language.support/support.limits/limits/is_specialized.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/limits/is_specialized.pass.cpp
@@ -63,7 +63,7 @@ int main(int, char**)
test<unsigned long>();
test<signed long long>();
test<unsigned long long>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__int128_t>();
test<__uint128_t>();
#endif
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/const_data_members.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/const_data_members.pass.cpp
index b5912130a8db5..1d4c2686c7bb1 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/const_data_members.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/const_data_members.pass.cpp
@@ -138,7 +138,7 @@ int main(int, char**)
TEST_NUMERIC_LIMITS(volatile long)
TEST_NUMERIC_LIMITS(const volatile long)
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
TEST_NUMERIC_LIMITS(__int128_t)
TEST_NUMERIC_LIMITS(const __int128_t)
TEST_NUMERIC_LIMITS(volatile __int128_t)
@@ -175,7 +175,7 @@ int main(int, char**)
TEST_NUMERIC_LIMITS(volatile unsigned long long)
TEST_NUMERIC_LIMITS(const volatile unsigned long long)
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
TEST_NUMERIC_LIMITS(__uint128_t)
TEST_NUMERIC_LIMITS(const __uint128_t)
TEST_NUMERIC_LIMITS(volatile __uint128_t)
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/denorm_min.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/denorm_min.pass.cpp
index 49d22dc44f7e4..7b0123cac1d03 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/denorm_min.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/denorm_min.pass.cpp
@@ -48,7 +48,7 @@ int main(int, char**)
test<unsigned long>(0);
test<long long>(0);
test<unsigned long long>(0);
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__int128_t>(0);
test<__uint128_t>(0);
#endif
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/digits.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/digits.pass.cpp
index e0f8c311c53b2..dc2a1e50c27bb 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/digits.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/digits.pass.cpp
@@ -47,7 +47,7 @@ int main(int, char**)
test<unsigned long, sizeof(long) == 4 ? 32 : 64>();
test<long long, 63>();
test<unsigned long long, 64>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__int128_t, 127>();
test<__uint128_t, 128>();
#endif
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/digits10.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/digits10.pass.cpp
index bb440fbc91776..12f61cf23e355 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/digits10.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/digits10.pass.cpp
@@ -51,7 +51,7 @@ int main(int, char**)
test<unsigned long, sizeof(long) == 4 ? 9 : 19>();
test<long long, 18>();
test<unsigned long long, 19>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__int128_t, 38>();
test<__uint128_t, 38>();
#endif
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/epsilon.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/epsilon.pass.cpp
index cc49c4b2ef102..f47e538d1454f 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/epsilon.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/epsilon.pass.cpp
@@ -48,7 +48,7 @@ int main(int, char**)
test<unsigned long>(0);
test<long long>(0);
test<unsigned long long>(0);
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__int128_t>(0);
test<__uint128_t>(0);
#endif
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_denorm.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_denorm.pass.cpp
index d72580c981574..6974650a99014 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_denorm.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_denorm.pass.cpp
@@ -46,7 +46,7 @@ int main(int, char**)
test<unsigned long, std::denorm_absent>();
test<long long, std::denorm_absent>();
test<unsigned long long, std::denorm_absent>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__int128_t, std::denorm_absent>();
test<__uint128_t, std::denorm_absent>();
#endif
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_denorm_loss.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_denorm_loss.pass.cpp
index ebb684b73c939..43082f396ad2e 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_denorm_loss.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_denorm_loss.pass.cpp
@@ -46,7 +46,7 @@ int main(int, char**)
test<unsigned long, false>();
test<long long, false>();
test<unsigned long long, false>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__int128_t, false>();
test<__uint128_t, false>();
#endif
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_infinity.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_infinity.pass.cpp
index 67745b4e7fd57..af5f6cea36af3 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_infinity.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_infinity.pass.cpp
@@ -46,7 +46,7 @@ int main(int, char**)
test<unsigned long, false>();
test<long long, false>();
test<unsigned long long, false>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__int128_t, false>();
test<__uint128_t, false>();
#endif
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_quiet_NaN.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_quiet_NaN.pass.cpp
index 730b86967a52a..98d25700a32ee 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_quiet_NaN.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_quiet_NaN.pass.cpp
@@ -46,7 +46,7 @@ int main(int, char**)
test<unsigned long, false>();
test<long long, false>();
test<unsigned long long, false>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__int128_t, false>();
test<__uint128_t, false>();
#endif
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_signaling_NaN.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_signaling_NaN.pass.cpp
index 799c50547fda8..cedb9c41eba1d 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_signaling_NaN.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_signaling_NaN.pass.cpp
@@ -46,7 +46,7 @@ int main(int, char**)
test<unsigned long, false>();
test<long long, false>();
test<unsigned long long, false>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__int128_t, false>();
test<__uint128_t, false>();
#endif
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/infinity.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/infinity.pass.cpp
index 912ae16566a0b..71c323e31ce5c 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/infinity.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/infinity.pass.cpp
@@ -50,7 +50,7 @@ int main(int, char**)
test<unsigned long>(0);
test<long long>(0);
test<unsigned long long>(0);
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__int128_t>(0);
test<__uint128_t>(0);
#endif
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_bounded.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_bounded.pass.cpp
index 556e402c94ec0..86dbdaee5e40f 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_bounded.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_bounded.pass.cpp
@@ -46,7 +46,7 @@ int main(int, char**)
test<unsigned long, true>();
test<long long, true>();
test<unsigned long long, true>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__int128_t, true>();
test<__uint128_t, true>();
#endif
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_exact.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_exact.pass.cpp
index a257d3b4490cf..34a62989170b7 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_exact.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_exact.pass.cpp
@@ -46,7 +46,7 @@ int main(int, char**)
test<unsigned long, true>();
test<long long, true>();
test<unsigned long long, true>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__int128_t, true>();
test<__uint128_t, true>();
#endif
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_iec559.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_iec559.pass.cpp
index b527194239376..0ffc60694d638 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_iec559.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_iec559.pass.cpp
@@ -46,7 +46,7 @@ int main(int, char**)
test<unsigned long, false>();
test<long long, false>();
test<unsigned long long, false>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__int128_t, false>();
test<__uint128_t, false>();
#endif
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_integer.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_integer.pass.cpp
index d31795254d4f0..e1db2c7063a0d 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_integer.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_integer.pass.cpp
@@ -46,7 +46,7 @@ int main(int, char**)
test<unsigned long, true>();
test<long long, true>();
test<unsigned long long, true>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__int128_t, true>();
test<__uint128_t, true>();
#endif
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_modulo.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_modulo.pass.cpp
index 6495bf4933d71..33b3e927402d6 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_modulo.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_modulo.pass.cpp
@@ -46,7 +46,7 @@ int main(int, char**)
test<unsigned long, true>();
test<long long, false>();
test<unsigned long long, true>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__int128_t, false>();
test<__uint128_t, true>();
#endif
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_signed.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_signed.pass.cpp
index c2e639afcde14..5946062fe3b9a 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_signed.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_signed.pass.cpp
@@ -46,7 +46,7 @@ int main(int, char**)
test<unsigned long, false>();
test<long long, true>();
test<unsigned long long, false>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__int128_t, true>();
test<__uint128_t, false>();
#endif
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/lowest.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/lowest.pass.cpp
index 0169f2e27fde7..a59761c15d4d5 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/lowest.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/lowest.pass.cpp
@@ -59,7 +59,7 @@ int main(int, char**)
test<unsigned long>(0);
test<long long>(LLONG_MIN);
test<unsigned long long>(0);
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__int128_t>(-__int128_t(__uint128_t(-1)/2) - 1);
test<__uint128_t>(0);
#endif
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/max.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/max.pass.cpp
index dd689963c2ed9..85b949266791e 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/max.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/max.pass.cpp
@@ -59,7 +59,7 @@ int main(int, char**)
test<unsigned long>(ULONG_MAX);
test<long long>(LLONG_MAX);
test<unsigned long long>(ULLONG_MAX);
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__int128_t>(__int128_t(__uint128_t(-1)/2));
test<__uint128_t>(__uint128_t(-1));
#endif
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/max_digits10.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/max_digits10.pass.cpp
index ccf1d2b2ba4b9..cfa67fe830031 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/max_digits10.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/max_digits10.pass.cpp
@@ -47,7 +47,7 @@ int main(int, char**)
test<unsigned long, 0>();
test<long long, 0>();
test<unsigned long long, 0>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__int128_t, 0>();
test<__uint128_t, 0>();
#endif
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/max_exponent.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/max_exponent.pass.cpp
index 9c6493ba4de51..6c8046b1d0a24 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/max_exponent.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/max_exponent.pass.cpp
@@ -47,7 +47,7 @@ int main(int, char**)
test<unsigned long, 0>();
test<long long, 0>();
test<unsigned long long, 0>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__int128_t, 0>();
test<__uint128_t, 0>();
#endif
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/max_exponent10.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/max_exponent10.pass.cpp
index 53c8a1347e063..721fd2c294a36 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/max_exponent10.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/max_exponent10.pass.cpp
@@ -47,7 +47,7 @@ int main(int, char**)
test<unsigned long, 0>();
test<long long, 0>();
test<unsigned long long, 0>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__int128_t, 0>();
test<__uint128_t, 0>();
#endif
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/min.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/min.pass.cpp
index 525d7db4136e6..4e479c31575a6 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/min.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/min.pass.cpp
@@ -59,7 +59,7 @@ int main(int, char**)
test<unsigned long>(0);
test<long long>(LLONG_MIN);
test<unsigned long long>(0);
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__int128_t>(-__int128_t(__uint128_t(-1)/2) - 1);
test<__uint128_t>(0);
#endif
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/min_exponent.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/min_exponent.pass.cpp
index 0d4d8bf591fd3..d00a569f58173 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/min_exponent.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/min_exponent.pass.cpp
@@ -47,7 +47,7 @@ int main(int, char**)
test<unsigned long, 0>();
test<long long, 0>();
test<unsigned long long, 0>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__int128_t, 0>();
test<__uint128_t, 0>();
#endif
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/min_exponent10.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/min_exponent10.pass.cpp
index 7e798e19d4772..8fe442d231040 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/min_exponent10.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/min_exponent10.pass.cpp
@@ -47,7 +47,7 @@ int main(int, char**)
test<unsigned long, 0>();
test<long long, 0>();
test<unsigned long long, 0>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__int128_t, 0>();
test<__uint128_t, 0>();
#endif
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/quiet_NaN.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/quiet_NaN.pass.cpp
index 761f662c863ad..81291640985cc 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/quiet_NaN.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/quiet_NaN.pass.cpp
@@ -67,7 +67,7 @@ int main(int, char**)
test<unsigned long>();
test<long long>();
test<unsigned long long>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__int128_t>();
test<__uint128_t>();
#endif
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/radix.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/radix.pass.cpp
index 7d15a0f852984..4c6a01c7b27cb 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/radix.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/radix.pass.cpp
@@ -47,7 +47,7 @@ int main(int, char**)
test<unsigned long, 2>();
test<long long, 2>();
test<unsigned long long, 2>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__int128_t, 2>();
test<__uint128_t, 2>();
#endif
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/round_error.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/round_error.pass.cpp
index 6a39773308252..5eddfa23e8850 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/round_error.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/round_error.pass.cpp
@@ -48,7 +48,7 @@ int main(int, char**)
test<unsigned long>(0);
test<long long>(0);
test<unsigned long long>(0);
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__int128_t>(0);
test<__uint128_t>(0);
#endif
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/round_style.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/round_style.pass.cpp
index ad994f37e9dd9..5591dd7108640 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/round_style.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/round_style.pass.cpp
@@ -46,7 +46,7 @@ int main(int, char**)
test<unsigned long, std::round_toward_zero>();
test<long long, std::round_toward_zero>();
test<unsigned long long, std::round_toward_zero>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__int128_t, std::round_toward_zero>();
test<__uint128_t, std::round_toward_zero>();
#endif
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/signaling_NaN.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/signaling_NaN.pass.cpp
index d1683614983c5..6f754c6da3657 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/signaling_NaN.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/signaling_NaN.pass.cpp
@@ -67,7 +67,7 @@ int main(int, char**)
test<unsigned long>();
test<long long>();
test<unsigned long long>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__int128_t>();
test<__uint128_t>();
#endif
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/tinyness_before.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/tinyness_before.pass.cpp
index dcacd25b67b32..ede8e02bad86c 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/tinyness_before.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/tinyness_before.pass.cpp
@@ -46,7 +46,7 @@ int main(int, char**)
test<unsigned long, false>();
test<long long, false>();
test<unsigned long long, false>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__int128_t, false>();
test<__uint128_t, false>();
#endif
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/traps.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/traps.pass.cpp
index f5000dc34b2d5..014001809c352 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/traps.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/traps.pass.cpp
@@ -53,7 +53,7 @@ int main(int, char**)
test<unsigned long, integral_types_trap>();
test<long long, integral_types_trap>();
test<unsigned long long, integral_types_trap>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__int128_t, integral_types_trap>();
test<__uint128_t, integral_types_trap>();
#endif
diff --git a/libcxx/test/std/numerics/bit/bit.pow.two/bit_ceil.pass.cpp b/libcxx/test/std/numerics/bit/bit.pow.two/bit_ceil.pass.cpp
index f7aab2c9901ec..e1dd88e85bf35 100644
--- a/libcxx/test/std/numerics/bit/bit.pow.two/bit_ceil.pass.cpp
+++ b/libcxx/test/std/numerics/bit/bit.pow.two/bit_ceil.pass.cpp
@@ -53,7 +53,7 @@ constexpr bool test()
assert(std::bit_ceil(T(68)) == T(128));
assert(std::bit_ceil(T(69)) == T(128));
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
if constexpr (std::is_same_v<T, __uint128_t>) {
T val = 168;
T ceil = 256;
@@ -80,7 +80,7 @@ int main(int, char**)
static_assert(!std::is_invocable_v<L, int>);
static_assert(!std::is_invocable_v<L, long>);
static_assert(!std::is_invocable_v<L, long long>);
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
static_assert(!std::is_invocable_v<L, __int128_t>);
#endif
@@ -112,7 +112,7 @@ int main(int, char**)
static_assert(test<unsigned int>());
static_assert(test<unsigned long>());
static_assert(test<unsigned long long>());
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
static_assert(test<__uint128_t>());
#endif
static_assert(test<uint8_t>());
@@ -128,7 +128,7 @@ int main(int, char**)
test<unsigned int>();
test<unsigned long>();
test<unsigned long long>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__uint128_t>();
#endif
test<uint8_t>();
diff --git a/libcxx/test/std/numerics/bit/bit.pow.two/bit_floor.pass.cpp b/libcxx/test/std/numerics/bit/bit.pow.two/bit_floor.pass.cpp
index 2c6d8faf48d2e..045b1cc9a7ada 100644
--- a/libcxx/test/std/numerics/bit/bit.pow.two/bit_floor.pass.cpp
+++ b/libcxx/test/std/numerics/bit/bit.pow.two/bit_floor.pass.cpp
@@ -49,7 +49,7 @@ constexpr bool test()
assert(std::bit_floor(T(129)) == T(128));
assert(std::bit_floor(max) == T(max - (max >> 1)));
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
if constexpr (std::is_same_v<T, __uint128_t>) {
T val = T(128) << 32;
assert(std::bit_floor(val-1) == val/2);
@@ -76,7 +76,7 @@ int main(int, char**)
static_assert(!std::is_invocable_v<L, int>);
static_assert(!std::is_invocable_v<L, long>);
static_assert(!std::is_invocable_v<L, long long>);
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
static_assert(!std::is_invocable_v<L, __int128_t>);
#endif
@@ -108,7 +108,7 @@ int main(int, char**)
static_assert(test<unsigned int>());
static_assert(test<unsigned long>());
static_assert(test<unsigned long long>());
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
static_assert(test<__uint128_t>());
#endif
@@ -125,7 +125,7 @@ int main(int, char**)
test<unsigned int>();
test<unsigned long>();
test<unsigned long long>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__uint128_t>();
#endif
diff --git a/libcxx/test/std/numerics/bit/bit.pow.two/bit_width.pass.cpp b/libcxx/test/std/numerics/bit/bit.pow.two/bit_width.pass.cpp
index 17a25a8bf737e..43f47d36bfe90 100644
--- a/libcxx/test/std/numerics/bit/bit.pow.two/bit_width.pass.cpp
+++ b/libcxx/test/std/numerics/bit/bit.pow.two/bit_width.pass.cpp
@@ -52,7 +52,7 @@ constexpr bool test()
assert(std::bit_width(T(max - 1)) == T(std::numeric_limits<T>::digits));
assert(std::bit_width(max) == T(std::numeric_limits<T>::digits));
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
if constexpr (std::is_same_v<T, __uint128_t>) {
T val = 128;
val <<= 32;
@@ -81,7 +81,7 @@ int main(int, char**)
static_assert(!std::is_invocable_v<L, int>);
static_assert(!std::is_invocable_v<L, long>);
static_assert(!std::is_invocable_v<L, long long>);
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
static_assert(!std::is_invocable_v<L, __int128_t>);
#endif
@@ -113,7 +113,7 @@ int main(int, char**)
static_assert(test<unsigned int>());
static_assert(test<unsigned long>());
static_assert(test<unsigned long long>());
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
static_assert(test<__uint128_t>());
#endif
static_assert(test<uint8_t>());
@@ -129,7 +129,7 @@ int main(int, char**)
test<unsigned int>();
test<unsigned long>();
test<unsigned long long>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__uint128_t>();
#endif
test<uint8_t>();
diff --git a/libcxx/test/std/numerics/bit/bit.pow.two/has_single_bit.pass.cpp b/libcxx/test/std/numerics/bit/bit.pow.two/has_single_bit.pass.cpp
index f30185f4a1f28..687f9ad45ff1a 100644
--- a/libcxx/test/std/numerics/bit/bit.pow.two/has_single_bit.pass.cpp
+++ b/libcxx/test/std/numerics/bit/bit.pow.two/has_single_bit.pass.cpp
@@ -46,7 +46,7 @@ constexpr bool test()
assert(!std::has_single_bit(T(129)));
assert(!std::has_single_bit(max));
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
if constexpr (std::is_same_v<T, __uint128_t>) {
T val = T(1) << 32;
assert(!std::has_single_bit(val-1));
@@ -79,7 +79,7 @@ int main(int, char**)
static_assert(!std::is_invocable_v<L, int>);
static_assert(!std::is_invocable_v<L, long>);
static_assert(!std::is_invocable_v<L, long long>);
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
static_assert(!std::is_invocable_v<L, __int128_t>);
#endif
@@ -111,7 +111,7 @@ int main(int, char**)
static_assert(test<unsigned int>());
static_assert(test<unsigned long>());
static_assert(test<unsigned long long>());
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
static_assert(test<__uint128_t>());
#endif
static_assert(test<uint8_t>());
@@ -127,7 +127,7 @@ int main(int, char**)
test<unsigned int>();
test<unsigned long>();
test<unsigned long long>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__uint128_t>();
#endif
test<uint8_t>();
diff --git a/libcxx/test/std/numerics/bit/bitops.count/countl_one.pass.cpp b/libcxx/test/std/numerics/bit/bitops.count/countl_one.pass.cpp
index c1f61c896d985..23196aa6ecf3d 100644
--- a/libcxx/test/std/numerics/bit/bitops.count/countl_one.pass.cpp
+++ b/libcxx/test/std/numerics/bit/bitops.count/countl_one.pass.cpp
@@ -51,7 +51,7 @@ constexpr bool test()
assert(std::countl_one(T(max - 127)) == std::numeric_limits<T>::digits - 7);
assert(std::countl_one(T(max - 128)) == std::numeric_limits<T>::digits - 8);
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
if constexpr (std::is_same_v<T, __uint128_t>) {
T val = 128;
assert(std::countl_one(~val) == 120);
@@ -76,7 +76,7 @@ int main(int, char**)
static_assert(!std::is_invocable_v<L, int>);
static_assert(!std::is_invocable_v<L, long>);
static_assert(!std::is_invocable_v<L, long long>);
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
static_assert(!std::is_invocable_v<L, __int128_t>);
#endif
@@ -108,7 +108,7 @@ int main(int, char**)
static_assert(test<unsigned int>());
static_assert(test<unsigned long>());
static_assert(test<unsigned long long>());
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
static_assert(test<__uint128_t>());
#endif
static_assert(test<uint8_t>());
@@ -124,7 +124,7 @@ int main(int, char**)
test<unsigned int>();
test<unsigned long>();
test<unsigned long long>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__uint128_t>();
#endif
test<uint8_t>();
diff --git a/libcxx/test/std/numerics/bit/bitops.count/countl_zero.pass.cpp b/libcxx/test/std/numerics/bit/bitops.count/countl_zero.pass.cpp
index e30d0b17856dc..51675808f8340 100644
--- a/libcxx/test/std/numerics/bit/bitops.count/countl_zero.pass.cpp
+++ b/libcxx/test/std/numerics/bit/bitops.count/countl_zero.pass.cpp
@@ -48,7 +48,7 @@ constexpr bool test()
assert(std::countl_zero(T(128)) == dig - 8);
assert(std::countl_zero(max) == 0);
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
if constexpr (std::is_same_v<T, __uint128_t>) {
T val = T(128) << 32;
assert(std::countl_zero(val-1) == 89);
@@ -75,7 +75,7 @@ int main(int, char**)
static_assert(!std::is_invocable_v<L, int>);
static_assert(!std::is_invocable_v<L, long>);
static_assert(!std::is_invocable_v<L, long long>);
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
static_assert(!std::is_invocable_v<L, __int128_t>);
#endif
@@ -107,7 +107,7 @@ int main(int, char**)
static_assert(test<unsigned int>());
static_assert(test<unsigned long>());
static_assert(test<unsigned long long>());
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
static_assert(test<__uint128_t>());
#endif
static_assert(test<uint8_t>());
@@ -123,7 +123,7 @@ int main(int, char**)
test<unsigned int>();
test<unsigned long>();
test<unsigned long long>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__uint128_t>();
#endif
test<uint8_t>();
diff --git a/libcxx/test/std/numerics/bit/bitops.count/countr_one.pass.cpp b/libcxx/test/std/numerics/bit/bitops.count/countr_one.pass.cpp
index ccdf98f9372be..448fdcbf12fe8 100644
--- a/libcxx/test/std/numerics/bit/bitops.count/countr_one.pass.cpp
+++ b/libcxx/test/std/numerics/bit/bitops.count/countr_one.pass.cpp
@@ -49,7 +49,7 @@ constexpr bool test()
assert(std::countr_one(T(max - 1)) == 0);
assert(std::countr_one(max) == std::numeric_limits<T>::digits);
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
if constexpr (std::is_same_v<T, __uint128_t>) {
T val = 128;
assert(std::countr_one(val-1) == 7);
@@ -80,7 +80,7 @@ int main(int, char**)
static_assert(!std::is_invocable_v<L, int>);
static_assert(!std::is_invocable_v<L, long>);
static_assert(!std::is_invocable_v<L, long long>);
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
static_assert(!std::is_invocable_v<L, __int128_t>);
#endif
@@ -112,7 +112,7 @@ int main(int, char**)
static_assert(test<unsigned int>());
static_assert(test<unsigned long>());
static_assert(test<unsigned long long>());
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
static_assert(test<__uint128_t>());
#endif
static_assert(test<uint8_t>());
@@ -128,7 +128,7 @@ int main(int, char**)
test<unsigned int>();
test<unsigned long>();
test<unsigned long long>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__uint128_t>();
#endif
test<uint8_t>();
diff --git a/libcxx/test/std/numerics/bit/bitops.count/countr_zero.pass.cpp b/libcxx/test/std/numerics/bit/bitops.count/countr_zero.pass.cpp
index 49f708ffcf9b7..ffe5031d7e4d1 100644
--- a/libcxx/test/std/numerics/bit/bitops.count/countr_zero.pass.cpp
+++ b/libcxx/test/std/numerics/bit/bitops.count/countr_zero.pass.cpp
@@ -50,7 +50,7 @@ constexpr bool test()
assert(std::countr_zero(T(130)) == 1);
assert(std::countr_zero(max) == 0);
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
if constexpr (std::is_same_v<T, __uint128_t>) {
T val = T(128) << 32;
assert(std::countr_zero(val-1) == 0);
@@ -77,7 +77,7 @@ int main(int, char**)
static_assert(!std::is_invocable_v<L, int>);
static_assert(!std::is_invocable_v<L, long>);
static_assert(!std::is_invocable_v<L, long long>);
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
static_assert(!std::is_invocable_v<L, __int128_t>);
#endif
@@ -109,7 +109,7 @@ int main(int, char**)
static_assert(test<unsigned int>());
static_assert(test<unsigned long>());
static_assert(test<unsigned long long>());
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
static_assert(test<__uint128_t>());
#endif
static_assert(test<uint8_t>());
@@ -125,7 +125,7 @@ int main(int, char**)
test<unsigned int>();
test<unsigned long>();
test<unsigned long long>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__uint128_t>();
#endif
test<uint8_t>();
diff --git a/libcxx/test/std/numerics/bit/bitops.count/popcount.pass.cpp b/libcxx/test/std/numerics/bit/bitops.count/popcount.pass.cpp
index f5792c16ffc6b..3dd994b0868ad 100644
--- a/libcxx/test/std/numerics/bit/bitops.count/popcount.pass.cpp
+++ b/libcxx/test/std/numerics/bit/bitops.count/popcount.pass.cpp
@@ -50,7 +50,7 @@ constexpr bool test()
assert(std::popcount(T(max - 1)) == std::numeric_limits<T>::digits - 1);
assert(std::popcount(max) == std::numeric_limits<T>::digits);
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
if constexpr (std::is_same_v<T, __uint128_t>) {
T val = 128;
assert(std::popcount(val-1) == 7);
@@ -87,7 +87,7 @@ int main(int, char**)
static_assert(!std::is_invocable_v<L, int>);
static_assert(!std::is_invocable_v<L, long>);
static_assert(!std::is_invocable_v<L, long long>);
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
static_assert(!std::is_invocable_v<L, __int128_t>);
#endif
@@ -119,7 +119,7 @@ int main(int, char**)
static_assert(test<unsigned int>());
static_assert(test<unsigned long>());
static_assert(test<unsigned long long>());
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
static_assert(test<__uint128_t>());
#endif
static_assert(test<uint8_t>());
@@ -135,7 +135,7 @@ int main(int, char**)
test<unsigned int>();
test<unsigned long>();
test<unsigned long long>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__uint128_t>();
#endif
test<uint8_t>();
diff --git a/libcxx/test/std/numerics/bit/bitops.rot/rotl.pass.cpp b/libcxx/test/std/numerics/bit/bitops.rot/rotl.pass.cpp
index d9dc05faca146..1432aee7fe732 100644
--- a/libcxx/test/std/numerics/bit/bitops.rot/rotl.pass.cpp
+++ b/libcxx/test/std/numerics/bit/bitops.rot/rotl.pass.cpp
@@ -49,7 +49,7 @@ constexpr bool test()
assert(std::rotl(T(1), 6) == T(64));
assert(std::rotl(T(1), 7) == T(128));
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
if constexpr (std::is_same_v<T, __uint128_t>) {
T val = (T(1) << 63) | (T(1) << 64);
assert(std::rotl(val, 0) == val);
@@ -75,7 +75,7 @@ int main(int, char**)
static_assert(!std::is_invocable_v<L, int>);
static_assert(!std::is_invocable_v<L, long>);
static_assert(!std::is_invocable_v<L, long long>);
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
static_assert(!std::is_invocable_v<L, __int128_t>);
#endif
@@ -107,7 +107,7 @@ int main(int, char**)
static_assert(test<unsigned int>());
static_assert(test<unsigned long>());
static_assert(test<unsigned long long>());
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
static_assert(test<__uint128_t>());
#endif
@@ -124,7 +124,7 @@ int main(int, char**)
test<unsigned int>();
test<unsigned long>();
test<unsigned long long>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__uint128_t>();
#endif
diff --git a/libcxx/test/std/numerics/bit/bitops.rot/rotr.pass.cpp b/libcxx/test/std/numerics/bit/bitops.rot/rotr.pass.cpp
index 035b13d25f4f5..8c8505a2d5882 100644
--- a/libcxx/test/std/numerics/bit/bitops.rot/rotr.pass.cpp
+++ b/libcxx/test/std/numerics/bit/bitops.rot/rotr.pass.cpp
@@ -50,7 +50,7 @@ constexpr bool test()
assert(std::rotr(T(128), 6) == T(2));
assert(std::rotr(T(128), 7) == T(1));
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
if constexpr (std::is_same_v<T, __uint128_t>) {
T val = (T(1) << 63) | (T(1) << 64);
assert(std::rotr(val, 0) == val);
@@ -76,7 +76,7 @@ int main(int, char**)
static_assert(!std::is_invocable_v<L, int>);
static_assert(!std::is_invocable_v<L, long>);
static_assert(!std::is_invocable_v<L, long long>);
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
static_assert(!std::is_invocable_v<L, __int128_t>);
#endif
@@ -108,7 +108,7 @@ int main(int, char**)
static_assert(test<unsigned int>());
static_assert(test<unsigned long>());
static_assert(test<unsigned long long>());
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
static_assert(test<__uint128_t>());
#endif
@@ -125,7 +125,7 @@ int main(int, char**)
test<unsigned int>();
test<unsigned long>();
test<unsigned long long>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__uint128_t>();
#endif
diff --git a/libcxx/test/std/numerics/bit/byteswap.pass.cpp b/libcxx/test/std/numerics/bit/byteswap.pass.cpp
index ea72fbb631802..bd73515a918a2 100644
--- a/libcxx/test/std/numerics/bit/byteswap.pass.cpp
+++ b/libcxx/test/std/numerics/bit/byteswap.pass.cpp
@@ -64,7 +64,7 @@ constexpr bool test() {
test_num<int32_t>(0x01234567, 0x67452301);
test_num<int64_t>(0x0123456789ABCDEF, 0xEFCDAB8967452301);
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
const auto in = static_cast<__uint128_t>(0x0123456789ABCDEF) << 64 | 0x13579BDF02468ACE;
const auto expected = static_cast<__uint128_t>(0xCE8A4602DF9B5713) << 64 | 0xEFCDAB8967452301;
test_num<__uint128_t>(in, expected);
diff --git a/libcxx/test/std/numerics/numeric.ops/numeric.ops.midpoint/midpoint.integer.pass.cpp b/libcxx/test/std/numerics/numeric.ops/numeric.ops.midpoint/midpoint.integer.pass.cpp
index d6ff4bed8a7af..5e0b48be13e4b 100644
--- a/libcxx/test/std/numerics/numeric.ops/numeric.ops.midpoint/midpoint.integer.pass.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/numeric.ops.midpoint/midpoint.integer.pass.cpp
@@ -129,7 +129,7 @@ int main(int, char**)
unsigned_test<uint32_t>();
unsigned_test<uint64_t>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
unsigned_test<__uint128_t>();
signed_test<__int128_t>();
#endif
diff --git a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/eval.pass.cpp b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/eval.pass.cpp
index e36625af9ebe0..823cd1665302a 100644
--- a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/eval.pass.cpp
+++ b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/eval.pass.cpp
@@ -133,7 +133,7 @@ int main(int, char**)
// or unsigned long long.
// (We support __int128 as an extension.)
-#if !defined(_LIBCPP_HAS_NO_INT128) && !defined(TEST_BUGGY_I128_FP)
+#if !defined(TEST_HAS_NO_INT128) && !defined(TEST_BUGGY_I128_FP)
test_statistics<__int128_t, std::minstd_rand0>();
test_statistics<__uint128_t, std::minstd_rand0>();
diff --git a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/int128.pass.cpp b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/int128.pass.cpp
index ab8bda7058c3c..68e7c1e18a3fe 100644
--- a/libcxx/test/std/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/int128.pass.cpp
+++ b/libcxx/test/std/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/int128.pass.cpp
@@ -22,7 +22,7 @@
int main(int, char**) {
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
// Test that values outside of the 64-bit range can be produced.
{
@@ -80,7 +80,7 @@ int main(int, char**) {
}
}
-#endif // _LIBCPP_HAS_NO_INT128
+#endif // TEST_HAS_NO_INT128
return 0;
}
diff --git a/libcxx/test/std/numerics/rand/rand.req/rand.req.urng/uniform_random_bit_generator.compile.pass.cpp b/libcxx/test/std/numerics/rand/rand.req/rand.req.urng/uniform_random_bit_generator.compile.pass.cpp
index 77d2443aa715c..8ace1134ac61b 100644
--- a/libcxx/test/std/numerics/rand/rand.req/rand.req.urng/uniform_random_bit_generator.compile.pass.cpp
+++ b/libcxx/test/std/numerics/rand/rand.req/rand.req.urng/uniform_random_bit_generator.compile.pass.cpp
@@ -19,7 +19,7 @@
static_assert(std::uniform_random_bit_generator<
std::linear_congruential_engine<unsigned int, 0U, 1U, 2U> >);
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
static_assert(std::uniform_random_bit_generator<
std::subtract_with_carry_engine<__uint128_t, 1U, 2U, 3U> >);
#endif
diff --git a/libcxx/test/std/utilities/format/format.formatter/format.context/format.formatter.spec/formatter.signed_integral.pass.cpp b/libcxx/test/std/utilities/format/format.formatter/format.context/format.formatter.spec/formatter.signed_integral.pass.cpp
index d25441799483e..a63d7b4e4b116 100644
--- a/libcxx/test/std/utilities/format/format.formatter/format.context/format.formatter.spec/formatter.signed_integral.pass.cpp
+++ b/libcxx/test/std/utilities/format/format.formatter/format.context/format.formatter.spec/formatter.signed_integral.pass.cpp
@@ -110,7 +110,7 @@ void test_all_signed_integral_types() {
test_signed_integral_type<int, CharT>();
test_signed_integral_type<long, CharT>();
test_signed_integral_type<long long, CharT>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test_signed_integral_type<__int128_t, CharT>();
#endif
}
diff --git a/libcxx/test/std/utilities/format/format.formatter/format.context/format.formatter.spec/formatter.unsigned_integral.pass.cpp b/libcxx/test/std/utilities/format/format.formatter/format.context/format.formatter.spec/formatter.unsigned_integral.pass.cpp
index 4ee1cfc9dc808..7a4fcbc1d49d6 100644
--- a/libcxx/test/std/utilities/format/format.formatter/format.context/format.formatter.spec/formatter.unsigned_integral.pass.cpp
+++ b/libcxx/test/std/utilities/format/format.formatter/format.context/format.formatter.spec/formatter.unsigned_integral.pass.cpp
@@ -98,7 +98,7 @@ void test_all_unsigned_integral_types() {
test_unsigned_integral_type<unsigned, CharT>();
test_unsigned_integral_type<unsigned long, CharT>();
test_unsigned_integral_type<unsigned long long, CharT>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test_unsigned_integral_type<__uint128_t, CharT>();
#endif
}
diff --git a/libcxx/test/std/utilities/format/format.formatter/format.context/types.compile.pass.cpp b/libcxx/test/std/utilities/format/format.formatter/format.context/types.compile.pass.cpp
index 457aff231baec..9fb127d2fc4c0 100644
--- a/libcxx/test/std/utilities/format/format.formatter/format.context/types.compile.pass.cpp
+++ b/libcxx/test/std/utilities/format/format.formatter/format.context/types.compile.pass.cpp
@@ -61,7 +61,7 @@ constexpr void test() {
std::is_same_v<typename std::basic_format_context<OutIt, CharT>::
template formatter_type<unsigned long long>,
std::formatter<unsigned long long, CharT>>);
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
static_assert(
std::is_same_v<typename std::basic_format_context<
OutIt, CharT>::template formatter_type<__int128_t>,
diff --git a/libcxx/test/std/utilities/format/format.functions/format_tests.h b/libcxx/test/std/utilities/format/format.functions/format_tests.h
index 3b2d0c71f11cb..f5e84d14a192b 100644
--- a/libcxx/test/std/utilities/format/format.functions/format_tests.h
+++ b/libcxx/test/std/utilities/format/format.functions/format_tests.h
@@ -733,7 +733,7 @@ void format_test_signed_integer(TestFunction check, ExceptionTest check_exceptio
format_test_integer<int, CharT>(check, check_exception);
format_test_integer<long, CharT>(check, check_exception);
format_test_integer<long long, CharT>(check, check_exception);
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
format_test_integer<__int128_t, CharT>(check, check_exception);
#endif
// *** check the minma and maxima ***
@@ -790,7 +790,7 @@ void format_test_unsigned_integer(TestFunction check, ExceptionTest check_except
format_test_integer<unsigned, CharT>(check, check_exception);
format_test_integer<unsigned long, CharT>(check, check_exception);
format_test_integer<unsigned long long, CharT>(check, check_exception);
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
format_test_integer<__uint128_t, CharT>(check, check_exception);
#endif
// *** test the maxima ***
@@ -2564,7 +2564,7 @@ void format_tests(TestFunction check, ExceptionTest check_exception) {
check(STR("hello 42"), STR("hello {}"), static_cast<int>(42));
check(STR("hello 42"), STR("hello {}"), static_cast<long>(42));
check(STR("hello 42"), STR("hello {}"), static_cast<long long>(42));
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
check(STR("hello 42"), STR("hello {}"), static_cast<__int128_t>(42));
{
// Note 128-bit support is only partly implemented test the range
@@ -2587,7 +2587,7 @@ void format_tests(TestFunction check, ExceptionTest check_exception) {
check(STR("hello 42"), STR("hello {}"), static_cast<unsigned>(42));
check(STR("hello 42"), STR("hello {}"), static_cast<unsigned long>(42));
check(STR("hello 42"), STR("hello {}"), static_cast<unsigned long long>(42));
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
check(STR("hello 42"), STR("hello {}"), static_cast<__uint128_t>(42));
{
// Note 128-bit support is only partly implemented test the range
diff --git a/libcxx/test/std/utilities/function.objects/unord.hash/integral.pass.cpp b/libcxx/test/std/utilities/function.objects/unord.hash/integral.pass.cpp
index 4168b169935af..2cfed3e2ba22d 100644
--- a/libcxx/test/std/utilities/function.objects/unord.hash/integral.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/unord.hash/integral.pass.cpp
@@ -110,7 +110,7 @@ int main(int, char**)
test<uintmax_t>();
test<uintptr_t>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test<__int128_t>();
test<__uint128_t>();
#endif
diff --git a/libcxx/test/std/utilities/meta/meta.trans/meta.trans.sign/make_signed.pass.cpp b/libcxx/test/std/utilities/meta/meta.trans/meta.trans.sign/make_signed.pass.cpp
index 9c06c4192ec0f..bf43d6d690c36 100644
--- a/libcxx/test/std/utilities/meta/meta.trans/meta.trans.sign/make_signed.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.trans/meta.trans.sign/make_signed.pass.cpp
@@ -26,7 +26,7 @@ enum BigEnum
big = 0xFFFFFFFFFFFFFFFFULL
};
-#if !defined(_LIBCPP_HAS_NO_INT128) && !defined(_LIBCPP_HAS_NO_STRONG_ENUMS)
+#if !defined(TEST_HAS_NO_INT128) && !defined(_LIBCPP_HAS_NO_STRONG_ENUMS)
enum HugeEnum : __uint128_t
{
hugezero
@@ -59,7 +59,7 @@ int main(int, char**)
test_make_signed< const wchar_t, std::conditional<sizeof(wchar_t) == 4, const int, const short>::type >();
test_make_signed< const Enum, std::conditional<sizeof(Enum) == sizeof(int), const int, const signed char>::type >();
test_make_signed< BigEnum, std::conditional<sizeof(long) == 4, long long, long>::type >();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test_make_signed< __int128_t, __int128_t >();
test_make_signed< __uint128_t, __int128_t >();
# ifndef _LIBCPP_HAS_NO_STRONG_ENUMS
diff --git a/libcxx/test/std/utilities/meta/meta.trans/meta.trans.sign/make_unsigned.pass.cpp b/libcxx/test/std/utilities/meta/meta.trans/meta.trans.sign/make_unsigned.pass.cpp
index b23ef4b76f704..e513997158211 100644
--- a/libcxx/test/std/utilities/meta/meta.trans/meta.trans.sign/make_unsigned.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.trans/meta.trans.sign/make_unsigned.pass.cpp
@@ -26,7 +26,7 @@ enum BigEnum
big = 0xFFFFFFFFFFFFFFFFULL
};
-#if !defined(_LIBCPP_HAS_NO_INT128) && !defined(_LIBCPP_HAS_NO_STRONG_ENUMS)
+#if !defined(TEST_HAS_NO_INT128) && !defined(_LIBCPP_HAS_NO_STRONG_ENUMS)
enum HugeEnum : __int128_t
{
hugezero
@@ -60,7 +60,7 @@ int main(int, char**)
test_make_unsigned<const Enum, std::conditional<sizeof(Enum) == sizeof(int), const unsigned int, const unsigned char>::type >();
test_make_unsigned<BigEnum,
std::conditional<sizeof(long) == 4, unsigned long long, unsigned long>::type> ();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test_make_unsigned<__int128_t, __uint128_t>();
test_make_unsigned<__uint128_t, __uint128_t>();
# ifndef _LIBCPP_HAS_NO_STRONG_ENUMS
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/integral.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/integral.pass.cpp
index df66316b9c8ea..161d55cad5868 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/integral.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/integral.pass.cpp
@@ -60,7 +60,7 @@ int main(int, char**)
test_integral<unsigned long>();
test_integral<long long>();
test_integral<unsigned long long>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test_integral<__int128_t>();
test_integral<__uint128_t>();
#endif
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/integral.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/integral.pass.cpp
index 0cbeb4a320532..a378ad8d49583 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/integral.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/integral.pass.cpp
@@ -50,7 +50,7 @@ int main(int, char**)
test_integral<unsigned long>();
test_integral<long long>();
test_integral<unsigned long long>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test_integral<__int128_t>();
test_integral<__uint128_t>();
#endif
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.prop/is_signed.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.prop/is_signed.pass.cpp
index 29a259fb2588e..6d11561af7547 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.prop/is_signed.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.prop/is_signed.pass.cpp
@@ -119,7 +119,7 @@ int main(int, char**)
test_is_not_signed<bool>();
test_is_not_signed<unsigned>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test_is_signed<__int128_t>();
test_is_not_signed<__uint128_t>();
#endif
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.prop/is_unsigned.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.prop/is_unsigned.pass.cpp
index 3c200b8f39054..abf21e60b5927 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.prop/is_unsigned.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.prop/is_unsigned.pass.cpp
@@ -119,7 +119,7 @@ int main(int, char**)
test_is_unsigned<bool>();
test_is_unsigned<unsigned>();
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
test_is_unsigned<__uint128_t>();
test_is_not_unsigned<__int128_t>();
#endif
diff --git a/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_equal/cmp_equal.pass.cpp b/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_equal/cmp_equal.pass.cpp
index b57ea44863387..f17aa9cf8f250 100644
--- a/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_equal/cmp_equal.pass.cpp
+++ b/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_equal/cmp_equal.pass.cpp
@@ -89,7 +89,7 @@ constexpr void test2(const std::tuple<Ts...>&, const UTuple& utuple) {
constexpr bool test() {
std::tuple<
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
__int128_t, __uint128_t,
#endif
unsigned long long, long long, unsigned long, long, unsigned int, int,
diff --git a/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_greater/cmp_greater.pass.cpp b/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_greater/cmp_greater.pass.cpp
index b8afc7d6d2aee..a2a11152a7c6e 100644
--- a/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_greater/cmp_greater.pass.cpp
+++ b/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_greater/cmp_greater.pass.cpp
@@ -80,7 +80,7 @@ constexpr void test2(const std::tuple<Ts...>&, const UTuple& utuple) {
constexpr bool test() {
std::tuple<
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
__int128_t, __uint128_t,
#endif
unsigned long long, long long, unsigned long, long, unsigned int, int,
diff --git a/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_greater_equal/cmp_greater_equal.pass.cpp b/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_greater_equal/cmp_greater_equal.pass.cpp
index d166633de0924..b45b74609e2b8 100644
--- a/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_greater_equal/cmp_greater_equal.pass.cpp
+++ b/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_greater_equal/cmp_greater_equal.pass.cpp
@@ -82,7 +82,7 @@ constexpr void test2(const std::tuple<Ts...>&, const UTuple& utuple) {
constexpr bool test() {
std::tuple<
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
__int128_t, __uint128_t,
#endif
unsigned long long, long long, unsigned long, long, unsigned int, int,
diff --git a/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_less/cmp_less.pass.cpp b/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_less/cmp_less.pass.cpp
index bc39fa6102276..5c6a9acb34c75 100644
--- a/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_less/cmp_less.pass.cpp
+++ b/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_less/cmp_less.pass.cpp
@@ -81,7 +81,7 @@ constexpr void test2(const std::tuple<Ts...>&, const UTuple& utuple) {
constexpr bool test() {
std::tuple<
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
__int128_t, __uint128_t,
#endif
unsigned long long, long long, unsigned long, long, unsigned int, int,
diff --git a/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_less_equal/cmp_less_equal.pass.cpp b/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_less_equal/cmp_less_equal.pass.cpp
index 2dc6d1be00729..3cf6044e0b524 100644
--- a/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_less_equal/cmp_less_equal.pass.cpp
+++ b/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_less_equal/cmp_less_equal.pass.cpp
@@ -81,7 +81,7 @@ constexpr void test2(const std::tuple<Ts...>&, const UTuple& utuple) {
constexpr bool test() {
std::tuple<
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
__int128_t, __uint128_t,
#endif
unsigned long long, long long, unsigned long, long, unsigned int, int,
diff --git a/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_not_equal/cmp_not_equal.pass.cpp b/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_not_equal/cmp_not_equal.pass.cpp
index 97ab5426f6d18..8ce69469a2bc7 100644
--- a/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_not_equal/cmp_not_equal.pass.cpp
+++ b/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_not_equal/cmp_not_equal.pass.cpp
@@ -88,7 +88,7 @@ constexpr void test2(const std::tuple<Ts...>&, const UTuple& utuple) {
constexpr bool test() {
std::tuple<
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
__int128_t, __uint128_t,
#endif
unsigned long long, long long, unsigned long, long, unsigned int, int,
diff --git a/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.in_range/in_range.pass.cpp b/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.in_range/in_range.pass.cpp
index 31f77c4418721..eff207a4a0684 100644
--- a/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.in_range/in_range.pass.cpp
+++ b/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.in_range/in_range.pass.cpp
@@ -64,7 +64,7 @@ constexpr void test1(const std::tuple<Ts...>&) {
constexpr bool test() {
std::tuple<
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
__int128_t, __uint128_t,
#endif
unsigned long long, long long, unsigned long, long, unsigned int, int,
diff --git a/libcxx/test/support/msvc_stdlib_force_include.h b/libcxx/test/support/msvc_stdlib_force_include.h
index bd83bee22ce73..dedd5d3ef8921 100644
--- a/libcxx/test/support/msvc_stdlib_force_include.h
+++ b/libcxx/test/support/msvc_stdlib_force_include.h
@@ -62,9 +62,6 @@ const AssertionDialogAvoider assertion_dialog_avoider{};
#pragma warning(disable: 28251) // Inconsistent annotation for 'new': this instance has no annotations.
#endif // !defined(__clang__)
-// MSVC doesn't have __int128_t.
-#define _LIBCPP_HAS_NO_INT128
-
#ifndef _LIBCXX_IN_DEVCRT
// atomic_is_lock_free.pass.cpp needs this VS 2015 Update 2 fix.
#define _ENABLE_ATOMIC_ALIGNMENT_FIX
diff --git a/libcxx/test/support/poisoned_hash_helper.h b/libcxx/test/support/poisoned_hash_helper.h
index bb4b70ba86e5e..a9314b8874354 100644
--- a/libcxx/test/support/poisoned_hash_helper.h
+++ b/libcxx/test/support/poisoned_hash_helper.h
@@ -72,7 +72,7 @@ using LibraryHashTypes = TypeList<
unsigned long,
long long,
unsigned long long,
-#ifndef _LIBCPP_HAS_NO_INT128
+#ifndef TEST_HAS_NO_INT128
__int128_t,
__uint128_t,
#endif
diff --git a/libcxx/test/support/test_macros.h b/libcxx/test/support/test_macros.h
index 5333d344588ea..bf48fb5c2f22a 100644
--- a/libcxx/test/support/test_macros.h
+++ b/libcxx/test/support/test_macros.h
@@ -368,6 +368,10 @@ inline void DoNotOptimize(Tp const& value) {
# define TEST_HAS_NO_UNICODE
#endif
+#if defined(_LIBCPP_HAS_NO_INT128) || defined(TEST_COMPILER_MSVC)
+# define TEST_HAS_NO_INT128
+#endif
+
#if defined(__GNUC__)
#pragma GCC diagnostic pop
#endif
More information about the libcxx-commits
mailing list