From 8f2f0d8f5f15966101310b6d295104507013fa4f Mon Sep 17 00:00:00 2001 From: "Stephan T. Lavavej" Date: Sat, 1 Jun 2024 11:39:05 -0700 Subject: [PATCH 1/4] Fix `__has_include` usage. --- libcxx/test/support/test_macros.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libcxx/test/support/test_macros.h b/libcxx/test/support/test_macros.h index 68dd591cb5755..15fc5b69b5207 100644 --- a/libcxx/test/support/test_macros.h +++ b/libcxx/test/support/test_macros.h @@ -11,7 +11,7 @@ #define SUPPORT_TEST_MACROS_HPP #ifdef __has_include -# if __has_include("") +# if __has_include() # include # else # include From 5b05628555fc76adcc0ba79ce5b4c5a831e80695 Mon Sep 17 00:00:00 2001 From: "Stephan T. Lavavej" Date: Sat, 1 Jun 2024 11:58:13 -0700 Subject: [PATCH 2/4] thread.condition.condvarany/wait_for_pred.pass.cpp forgot to test anything. Follow what wait_for.pass.cpp is doing. --- .../thread.condition.condvarany/wait_for_pred.pass.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libcxx/test/std/thread/thread.condition/thread.condition.condvarany/wait_for_pred.pass.cpp b/libcxx/test/std/thread/thread.condition/thread.condition.condvarany/wait_for_pred.pass.cpp index 2dc36938b41e9..67ba06b835297 100644 --- a/libcxx/test/std/thread/thread.condition/thread.condition.condvarany/wait_for_pred.pass.cpp +++ b/libcxx/test/std/thread/thread.condition/thread.condition.condvarany/wait_for_pred.pass.cpp @@ -162,4 +162,10 @@ void test() { } } -int main(int, char**) { return 0; } +int main(int, char**) { + test>(); + test>(); + test>(); + test>(); + return 0; +} From 6d5bbb6353e8fa6902007eb909f7a99e5331c594 Mon Sep 17 00:00:00 2001 From: "Stephan T. Lavavej" Date: Sat, 1 Jun 2024 12:20:10 -0700 Subject: [PATCH 3/4] Uncomment spaceship test coverage. --- .../totally_ordered.pass.cpp | 13 ++++++------- .../totally_ordered_with.pass.cpp | 9 ++++----- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/libcxx/test/std/concepts/concepts.compare/concepts.totallyordered/totally_ordered.pass.cpp b/libcxx/test/std/concepts/concepts.compare/concepts.totallyordered/totally_ordered.pass.cpp index 2e9dd0f9e7df9..d0f90337ec480 100644 --- a/libcxx/test/std/concepts/concepts.compare/concepts.totallyordered/totally_ordered.pass.cpp +++ b/libcxx/test/std/concepts/concepts.compare/concepts.totallyordered/totally_ordered.pass.cpp @@ -111,13 +111,12 @@ static_assert(!std::totally_ordered >); static_assert(!std::totally_ordered >); struct A {}; -// FIXME(cjdb): uncomment when operator<=> is implemented for each of these types. -// static_assert(!std::totally_ordered >); -// static_assert(!std::totally_ordered >); -// static_assert(!std::totally_ordered >); -// static_assert(!std::totally_ordered >); -// static_assert(!std::totally_ordered >); -// static_assert(!std::totally_ordered >); +static_assert(!std::totally_ordered >); +static_assert(!std::totally_ordered >); +static_assert(!std::totally_ordered >); +static_assert(!std::totally_ordered >); +static_assert(!std::totally_ordered >); +static_assert(!std::totally_ordered >); } // namespace standard_types namespace types_fit_for_purpose { diff --git a/libcxx/test/std/concepts/concepts.compare/concepts.totallyordered/totally_ordered_with.pass.cpp b/libcxx/test/std/concepts/concepts.compare/concepts.totallyordered/totally_ordered_with.pass.cpp index 54861c1c4248f..bbe06658978bc 100644 --- a/libcxx/test/std/concepts/concepts.compare/concepts.totallyordered/totally_ordered_with.pass.cpp +++ b/libcxx/test/std/concepts/concepts.compare/concepts.totallyordered/totally_ordered_with.pass.cpp @@ -1034,11 +1034,10 @@ static_assert( static_assert(!check_totally_ordered_with, int>()); struct A {}; -// FIXME(cjdb): uncomment when operator<=> is implemented for each of these types. -// static_assert(!check_totally_ordered_with >, -// std::optional > >()); -// static_assert(!check_totally_ordered_with >, -// std::vector >()); +static_assert(!check_totally_ordered_with >, + std::optional > >()); +static_assert(!check_totally_ordered_with >, + std::vector >()); struct B {}; static_assert(!check_totally_ordered_with, std::vector >()); static_assert( From 2d24b68d81cdf327111c3275dc58bee6824d9bf8 Mon Sep 17 00:00:00 2001 From: "Stephan T. Lavavej" Date: Sat, 1 Jun 2024 13:20:10 -0700 Subject: [PATCH 4/4] clang-format. --- .../concepts.totallyordered/totally_ordered_with.pass.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libcxx/test/std/concepts/concepts.compare/concepts.totallyordered/totally_ordered_with.pass.cpp b/libcxx/test/std/concepts/concepts.compare/concepts.totallyordered/totally_ordered_with.pass.cpp index bbe06658978bc..5f71a3911539b 100644 --- a/libcxx/test/std/concepts/concepts.compare/concepts.totallyordered/totally_ordered_with.pass.cpp +++ b/libcxx/test/std/concepts/concepts.compare/concepts.totallyordered/totally_ordered_with.pass.cpp @@ -1034,10 +1034,8 @@ static_assert( static_assert(!check_totally_ordered_with, int>()); struct A {}; -static_assert(!check_totally_ordered_with >, - std::optional > >()); -static_assert(!check_totally_ordered_with >, - std::vector >()); +static_assert(!check_totally_ordered_with >, std::optional > >()); +static_assert(!check_totally_ordered_with >, std::vector >()); struct B {}; static_assert(!check_totally_ordered_with, std::vector >()); static_assert(