diff options
| author | Stephan T. Lavavej <stl@nuwen.net> | 2024-06-02 03:37:31 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-02 12:37:31 +0200 |
| commit | 45964eb9b88c46045e4e84beb4e2135cdeed6855 (patch) | |
| tree | fe6babf53eca80e59e5225c7c5f735b8e74e60ce /libcxx/test | |
| parent | c9a86fa9a631eb77f229e457a323caec705600bf (diff) | |
| download | llvm-45964eb9b88c46045e4e84beb4e2135cdeed6855.zip llvm-45964eb9b88c46045e4e84beb4e2135cdeed6855.tar.gz llvm-45964eb9b88c46045e4e84beb4e2135cdeed6855.tar.bz2 | |
[libc++] [test] Fix `__has_include` usage, expand condvarany and spaceship coverage (#94120)
Three unrelated, small improvements:
* `test_macros.h` was incorrectly saying `__has_include("<version>")`
instead of `__has_include(<version>)`.
+ This caused `<ciso646>` to always be included (noticed because MSVC's
STL emitted a deprecation warning).
+ I searched all of LLVM and found no other occurrences.
* `thread.condition.condvarany/wait_for_pred.pass.cpp` forgot to test
anything.
+ I followed what `wait_for.pass.cpp` is testing.
* Uncomment spaceship test coverage.
Diffstat (limited to 'libcxx/test')
4 files changed, 16 insertions, 14 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 2e9dd0f..d0f9033 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<std::unordered_map<int, void*> >); static_assert(!std::totally_ordered<std::unordered_set<int> >); struct A {}; -// FIXME(cjdb): uncomment when operator<=> is implemented for each of these types. -// static_assert(!std::totally_ordered<std::array<A, 10> >); -// static_assert(!std::totally_ordered<std::deque<A> >); -// static_assert(!std::totally_ordered<std::forward_list<A> >); -// static_assert(!std::totally_ordered<std::list<A> >); -// static_assert(!std::totally_ordered<std::set<A> >); -// static_assert(!std::totally_ordered<std::vector<A> >); +static_assert(!std::totally_ordered<std::array<A, 10> >); +static_assert(!std::totally_ordered<std::deque<A> >); +static_assert(!std::totally_ordered<std::forward_list<A> >); +static_assert(!std::totally_ordered<std::list<A> >); +static_assert(!std::totally_ordered<std::set<A> >); +static_assert(!std::totally_ordered<std::vector<A> >); } // 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 54861c1..5f71a39 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,8 @@ static_assert( static_assert(!check_totally_ordered_with<std::vector<int>, int>()); struct A {}; -// FIXME(cjdb): uncomment when operator<=> is implemented for each of these types. -// static_assert(!check_totally_ordered_with<std::optional<std::vector<A> >, -// std::optional<std::vector<A> > >()); -// static_assert(!check_totally_ordered_with<std::optional<std::vector<A> >, -// std::vector<A> >()); +static_assert(!check_totally_ordered_with<std::optional<std::vector<A> >, std::optional<std::vector<A> > >()); +static_assert(!check_totally_ordered_with<std::optional<std::vector<A> >, std::vector<A> >()); struct B {}; static_assert(!check_totally_ordered_with<std::vector<A>, std::vector<B> >()); static_assert( 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 2dc3693..67ba06b 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<std::unique_lock<std::mutex>>(); + test<std::unique_lock<std::timed_mutex>>(); + test<MyLock<std::mutex>>(); + test<MyLock<std::timed_mutex>>(); + return 0; +} diff --git a/libcxx/test/support/test_macros.h b/libcxx/test/support/test_macros.h index 68dd591..15fc5b6 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("<version>") +# if __has_include(<version>) # include <version> # else # include <ciso646> |