Skip to content

Commit

Permalink
[libc++][test] Enable constexpr string comparison tests
Browse files Browse the repository at this point in the history 
Some tests in `string.view.comparison` are not enabled due to previous lack of
support for `constexpr std::string`. Now that it is implemented, we can enable
these tests.

Differential Revision: https://reviews.llvm.org/D126737
  • Loading branch information
@JoeLoser
JoeLoser committed Jun 2, 2022
1 parent 6784adc commit 93a375a
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 24 deletions.
6 changes: 2 additions & 4 deletions libcxx/test/std/strings/string.view/string.view.comparison/equal.pass.cpp
View file
Expand Up @@ -52,8 +52,7 @@ TEST_CONSTEXPR_CXX14 bool test()
assert((ConvertibleTo<SV>(v[i]) == v[j]) == expected);
assert((v[i] == ConvertibleTo<SV>(v[j])) == expected);

if (!TEST_IS_CONSTANT_EVALUATED) {
// TODO FIXME: once P0980 "Making std::string constexpr" is implemented
if (!TEST_IS_CONSTANT_EVALUATED || TEST_STD_VER >= 20) {
assert((std::basic_string<CharT, Traits>(v[i]) == v[j]) == expected);
assert((v[i] == std::basic_string<CharT, Traits>(v[j])) == expected);
}
Expand All @@ -74,8 +73,7 @@ TEST_CONSTEXPR_CXX14 bool test()
assert((abc.data() == abc0def) == false);
assert((abc0def == abc.data()) == false);

if (!TEST_IS_CONSTANT_EVALUATED) {
// TODO FIXME: once P0980 "Making std::string constexpr" is implemented
if (!TEST_IS_CONSTANT_EVALUATED || TEST_STD_VER >= 20) {
assert((std::basic_string<CharT, Traits>(abc) == abc0def) == false);
assert((abc0def == std::basic_string<CharT, Traits>(abc)) == false);
}
Expand Down
6 changes: 2 additions & 4 deletions libcxx/test/std/strings/string.view/string.view.comparison/greater.pass.cpp
View file
Expand Up @@ -52,8 +52,7 @@ TEST_CONSTEXPR_CXX14 bool test()
assert((ConvertibleTo<SV>(v[i]) > v[j]) == expected);
assert((v[i] > ConvertibleTo<SV>(v[j])) == expected);

if (!TEST_IS_CONSTANT_EVALUATED) {
// TODO FIXME: once P0980 "Making std::string constexpr" is implemented
if (!TEST_IS_CONSTANT_EVALUATED || TEST_STD_VER >= 20) {
assert((std::basic_string<CharT, Traits>(v[i]) > v[j]) == expected);
assert((v[i] > std::basic_string<CharT, Traits>(v[j])) == expected);
}
Expand All @@ -74,8 +73,7 @@ TEST_CONSTEXPR_CXX14 bool test()
assert((abc.data() > abc0def) == false);
assert((abc0def > abc.data()) == true);

if (!TEST_IS_CONSTANT_EVALUATED) {
// TODO FIXME: once P0980 "Making std::string constexpr" is implemented
if (!TEST_IS_CONSTANT_EVALUATED || TEST_STD_VER >= 20) {
assert((std::basic_string<CharT, Traits>(abc) > abc0def) == false);
assert((abc0def > std::basic_string<CharT, Traits>(abc)) == true);
}
Expand Down
6 changes: 2 additions & 4 deletions libcxx/test/std/strings/string.view/string.view.comparison/greater_equal.pass.cpp
View file
Expand Up @@ -52,8 +52,7 @@ TEST_CONSTEXPR_CXX14 bool test()
assert((ConvertibleTo<SV>(v[i]) >= v[j]) == expected);
assert((v[i] >= ConvertibleTo<SV>(v[j])) == expected);

if (!TEST_IS_CONSTANT_EVALUATED) {
// TODO FIXME: once P0980 "Making std::string constexpr" is implemented
if (!TEST_IS_CONSTANT_EVALUATED || TEST_STD_VER >= 20) {
assert((std::basic_string<CharT, Traits>(v[i]) >= v[j]) == expected);
assert((v[i] >= std::basic_string<CharT, Traits>(v[j])) == expected);
}
Expand All @@ -74,8 +73,7 @@ TEST_CONSTEXPR_CXX14 bool test()
assert((abc.data() >= abc0def) == false);
assert((abc0def >= abc.data()) == true);

if (!TEST_IS_CONSTANT_EVALUATED) {
// TODO FIXME: once P0980 "Making std::string constexpr" is implemented
if (!TEST_IS_CONSTANT_EVALUATED || TEST_STD_VER >= 20) {
assert((std::basic_string<CharT, Traits>(abc) >= abc0def) == false);
assert((abc0def >= std::basic_string<CharT, Traits>(abc)) == true);
}
Expand Down
6 changes: 2 additions & 4 deletions libcxx/test/std/strings/string.view/string.view.comparison/less.pass.cpp
View file
Expand Up @@ -52,8 +52,7 @@ TEST_CONSTEXPR_CXX14 bool test()
assert((ConvertibleTo<SV>(v[i]) < v[j]) == expected);
assert((v[i] < ConvertibleTo<SV>(v[j])) == expected);

if (!TEST_IS_CONSTANT_EVALUATED) {
// TODO FIXME: once P0980 "Making std::string constexpr" is implemented
if (!TEST_IS_CONSTANT_EVALUATED || TEST_STD_VER >= 20) {
assert((std::basic_string<CharT, Traits>(v[i]) < v[j]) == expected);
assert((v[i] < std::basic_string<CharT, Traits>(v[j])) == expected);
}
Expand All @@ -74,8 +73,7 @@ TEST_CONSTEXPR_CXX14 bool test()
assert((abc.data() < abc0def) == true);
assert((abc0def < abc.data()) == false);

if (!TEST_IS_CONSTANT_EVALUATED) {
// TODO FIXME: once P0980 "Making std::string constexpr" is implemented
if (!TEST_IS_CONSTANT_EVALUATED || TEST_STD_VER >= 20) {
assert((std::basic_string<CharT, Traits>(abc) < abc0def) == true);
assert((abc0def < std::basic_string<CharT, Traits>(abc)) == false);
}
Expand Down
6 changes: 2 additions & 4 deletions libcxx/test/std/strings/string.view/string.view.comparison/less_equal.pass.cpp
View file
Expand Up @@ -52,8 +52,7 @@ TEST_CONSTEXPR_CXX14 bool test()
assert((ConvertibleTo<SV>(v[i]) <= v[j]) == expected);
assert((v[i] <= ConvertibleTo<SV>(v[j])) == expected);

if (!TEST_IS_CONSTANT_EVALUATED) {
// TODO FIXME: once P0980 "Making std::string constexpr" is implemented
if (!TEST_IS_CONSTANT_EVALUATED || TEST_STD_VER >= 20) {
assert((std::basic_string<CharT, Traits>(v[i]) <= v[j]) == expected);
assert((v[i] <= std::basic_string<CharT, Traits>(v[j])) == expected);
}
Expand All @@ -74,8 +73,7 @@ TEST_CONSTEXPR_CXX14 bool test()
assert((abc.data() <= abc0def) == true);
assert((abc0def <= abc.data()) == false);

if (!TEST_IS_CONSTANT_EVALUATED) {
// TODO FIXME: once P0980 "Making std::string constexpr" is implemented
if (!TEST_IS_CONSTANT_EVALUATED || TEST_STD_VER >= 20) {
assert((std::basic_string<CharT, Traits>(abc) <= abc0def) == true);
assert((abc0def <= std::basic_string<CharT, Traits>(abc)) == false);
}
Expand Down
6 changes: 2 additions & 4 deletions libcxx/test/std/strings/string.view/string.view.comparison/not_equal.pass.cpp
View file
Expand Up @@ -52,8 +52,7 @@ TEST_CONSTEXPR_CXX14 bool test()
assert((ConvertibleTo<SV>(v[i]) != v[j]) == expected);
assert((v[i] != ConvertibleTo<SV>(v[j])) == expected);

if (!TEST_IS_CONSTANT_EVALUATED) {
// TODO FIXME: once P0980 "Making std::string constexpr" is implemented
if (!TEST_IS_CONSTANT_EVALUATED || TEST_STD_VER >= 20) {
assert((std::basic_string<CharT, Traits>(v[i]) != v[j]) == expected);
assert((v[i] != std::basic_string<CharT, Traits>(v[j])) == expected);
}
Expand All @@ -74,8 +73,7 @@ TEST_CONSTEXPR_CXX14 bool test()
assert((abc.data() != abc0def) == true);
assert((abc0def != abc.data()) == true);

if (!TEST_IS_CONSTANT_EVALUATED) {
// TODO FIXME: once P0980 "Making std::string constexpr" is implemented
if (!TEST_IS_CONSTANT_EVALUATED || TEST_STD_VER >= 20) {
assert((std::basic_string<CharT, Traits>(abc) != abc0def) == true);
assert((abc0def != std::basic_string<CharT, Traits>(abc)) == true);
}
Expand Down

0 comments on commit 93a375a

Please sign in to comment.