Skip to content

[libc++] [test] Fix __has_include usage, expand condvarany and spaceship coverage #94120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 2, 2024
Merged

[libc++] [test] Fix __has_include usage, expand condvarany and spaceship coverage #94120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8f2f0d8
Fix `__has_include` usage.
StephanTLavavej Jun 1, 2024
5b05628
thread.condition.condvarany/wait_for_pred.pass.cpp forgot to test any…
StephanTLavavej Jun 1, 2024
6d5bbb6
Uncomment spaceship test coverage.
StephanTLavavej Jun 1, 2024
2d24b68
clang-format.
StephanTLavavej Jun 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions libcxx/test/std/concepts/concepts.compare/concepts.totallyordered/totally_ordered.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
7 changes: 2 additions & 5 deletions .../test/std/concepts/concepts.compare/concepts.totallyordered/totally_ordered_with.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
8 changes: 7 additions & 1 deletion libcxx/test/std/thread/thread.condition/thread.condition.condvarany/wait_for_pred.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
2 changes: 1 addition & 1 deletion libcxx/test/support/test_macros.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down