[libc++][test] Use LIBCPP_ASSERT in some system_category-related tests
#78834
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
llvmbot
added
the
libc++
|
@llvm/pr-subscribers-libcxx Author: S. B. Tam (cpplearner) Changes
Although libc++'s Full diff: https://github.com/llvm/llvm-project/pull/78834.diff 3 Files Affected:
diff --git a/libcxx/test/std/diagnostics/syserr/syserr.compare/eq_error_code_error_code.pass.cpp b/libcxx/test/std/diagnostics/syserr/syserr.compare/eq_error_code_error_code.pass.cpp
index c63bfcd955a69c..f1f49733280b1d 100644
--- a/libcxx/test/std/diagnostics/syserr/syserr.compare/eq_error_code_error_code.pass.cpp
+++ b/libcxx/test/std/diagnostics/syserr/syserr.compare/eq_error_code_error_code.pass.cpp
@@ -22,88 +22,87 @@
#include "test_macros.h"
-int main(int, char**)
-{
- std::error_code e_code1(5, std::generic_category());
- std::error_code e_code2(5, std::system_category());
- std::error_code e_code3(6, std::generic_category());
- std::error_code e_code4(6, std::system_category());
- std::error_condition e_condition1(5, std::generic_category());
- std::error_condition e_condition2(5, std::system_category());
- std::error_condition e_condition3(6, std::generic_category());
- std::error_condition e_condition4(6, std::system_category());
+int main(int, char**) {
+ std::error_code e_code1(5, std::generic_category());
+ std::error_code e_code2(5, std::system_category());
+ std::error_code e_code3(6, std::generic_category());
+ std::error_code e_code4(6, std::system_category());
+ std::error_condition e_condition1(5, std::generic_category());
+ std::error_condition e_condition2(5, std::system_category());
+ std::error_condition e_condition3(6, std::generic_category());
+ std::error_condition e_condition4(6, std::system_category());
- assert(e_code1 == e_code1);
- assert(e_code1 != e_code2);
- assert(e_code1 != e_code3);
- assert(e_code1 != e_code4);
- assert(e_code1 == e_condition1);
- assert(e_code1 != e_condition2);
- assert(e_code1 != e_condition3);
- assert(e_code1 != e_condition4);
+ assert(e_code1 == e_code1);
+ assert(e_code1 != e_code2);
+ assert(e_code1 != e_code3);
+ assert(e_code1 != e_code4);
+ assert(e_code1 == e_condition1);
+ assert(e_code1 != e_condition2);
+ assert(e_code1 != e_condition3);
+ assert(e_code1 != e_condition4);
- assert(e_code2 != e_code1);
- assert(e_code2 == e_code2);
- assert(e_code2 != e_code3);
- assert(e_code2 != e_code4);
- assert(e_code2 == e_condition1); // ?
- assert(e_code2 == e_condition2);
- assert(e_code2 != e_condition3);
- assert(e_code2 != e_condition4);
+ assert(e_code2 != e_code1);
+ assert(e_code2 == e_code2);
+ assert(e_code2 != e_code3);
+ assert(e_code2 != e_code4);
+ LIBCPP_ASSERT(e_code2 == e_condition1);
+ assert(e_code2 == e_condition2);
+ LIBCPP_ASSERT(e_code2 != e_condition3);
+ assert(e_code2 != e_condition4);
- assert(e_code3 != e_code1);
- assert(e_code3 != e_code2);
- assert(e_code3 == e_code3);
- assert(e_code3 != e_code4);
- assert(e_code3 != e_condition1);
- assert(e_code3 != e_condition2);
- assert(e_code3 == e_condition3);
- assert(e_code3 != e_condition4);
+ assert(e_code3 != e_code1);
+ assert(e_code3 != e_code2);
+ assert(e_code3 == e_code3);
+ assert(e_code3 != e_code4);
+ assert(e_code3 != e_condition1);
+ assert(e_code3 != e_condition2);
+ assert(e_code3 == e_condition3);
+ assert(e_code3 != e_condition4);
- assert(e_code4 != e_code1);
- assert(e_code4 != e_code2);
- assert(e_code4 != e_code3);
- assert(e_code4 == e_code4);
- assert(e_code4 != e_condition1);
- assert(e_code4 != e_condition2);
- assert(e_code4 == e_condition3); // ?
- assert(e_code4 == e_condition4);
+ assert(e_code4 != e_code1);
+ assert(e_code4 != e_code2);
+ assert(e_code4 != e_code3);
+ assert(e_code4 == e_code4);
+ LIBCPP_ASSERT(e_code4 != e_condition1);
+ assert(e_code4 != e_condition2);
+ LIBCPP_ASSERT(e_code4 == e_condition3);
+ assert(e_code4 == e_condition4);
- assert(e_condition1 == e_code1);
- assert(e_condition1 == e_code2); // ?
- assert(e_condition1 != e_code3);
- assert(e_condition1 != e_code4);
- assert(e_condition1 == e_condition1);
- assert(e_condition1 != e_condition2);
- assert(e_condition1 != e_condition3);
- assert(e_condition1 != e_condition4);
+ assert(e_condition1 == e_code1);
+ LIBCPP_ASSERT(e_condition1 == e_code2);
+ assert(e_condition1 != e_code3);
+ LIBCPP_ASSERT(e_condition1 != e_code4);
+ assert(e_condition1 == e_condition1);
+ assert(e_condition1 != e_condition2);
+ assert(e_condition1 != e_condition3);
+ assert(e_condition1 != e_condition4);
- assert(e_condition2 != e_code1);
- assert(e_condition2 == e_code2);
- assert(e_condition2 != e_code3);
- assert(e_condition2 != e_code4);
- assert(e_condition2 != e_condition1);
- assert(e_condition2 == e_condition2);
- assert(e_condition2 != e_condition3);
- assert(e_condition2 != e_condition4);
+ assert(e_condition2 != e_code1);
+ assert(e_condition2 == e_code2);
+ assert(e_condition2 != e_code3);
+ assert(e_condition2 != e_code4);
+ assert(e_condition2 != e_condition1);
+ assert(e_condition2 == e_condition2);
+ assert(e_condition2 != e_condition3);
+ assert(e_condition2 != e_condition4);
- assert(e_condition3 != e_code1);
- assert(e_condition3 != e_code2);
- assert(e_condition3 == e_code3);
- assert(e_condition3 == e_code4); // ?
- assert(e_condition3 != e_condition1);
- assert(e_condition3 != e_condition2);
- assert(e_condition3 == e_condition3);
- assert(e_condition3 != e_condition4);
+ assert(e_condition3 != e_code1);
+ LIBCPP_ASSERT(e_condition3 != e_code2);
+ assert(e_condition3 == e_code3);
+ LIBCPP_ASSERT(e_condition3 == e_code4);
+ assert(e_condition3 != e_condition1);
+ assert(e_condition3 != e_condition2);
+ assert(e_condition3 == e_condition3);
+ assert(e_condition3 != e_condition4);
- assert(e_condition4 != e_code1);
- assert(e_condition4 != e_code2);
- assert(e_condition4 != e_code3);
- assert(e_condition4 == e_code4);
- assert(e_condition4 != e_condition1);
- assert(e_condition4 != e_condition2);
- assert(e_condition4 != e_condition3);
- assert(e_condition4 == e_condition4);
+ assert(e_condition4 != e_code1);
+ assert(e_condition4 != e_code2);
+ assert(e_condition4 != e_code3);
+ assert(e_condition4 == e_code4);
+ assert(e_condition4 != e_condition1);
+ assert(e_condition4 != e_condition2);
+ assert(e_condition4 != e_condition3);
+ assert(e_condition4 == e_condition4);
return 0;
}
diff --git a/libcxx/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.derived/message.pass.cpp b/libcxx/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.derived/message.pass.cpp
index a899638ce169ae..9f7eb42bc78d97 100644
--- a/libcxx/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.derived/message.pass.cpp
+++ b/libcxx/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.derived/message.pass.cpp
@@ -20,18 +20,17 @@
#include "test_macros.h"
-int main(int, char**)
-{
- const std::error_category& e_cat1 = std::generic_category();
- const std::error_category& e_cat2 = std::system_category();
- std::string m1 = e_cat1.message(5);
- std::string m2 = e_cat2.message(5);
- std::string m3 = e_cat2.message(6);
- assert(!m1.empty());
- assert(!m2.empty());
- assert(!m3.empty());
- assert(m1 == m2);
- assert(m1 != m3);
+int main(int, char**) {
+ const std::error_category& e_cat1 = std::generic_category();
+ const std::error_category& e_cat2 = std::system_category();
+ std::string m1 = e_cat1.message(5);
+ std::string m2 = e_cat2.message(5);
+ std::string m3 = e_cat2.message(6);
+ assert(!m1.empty());
+ assert(!m2.empty());
+ assert(!m3.empty());
+ LIBCPP_ASSERT(m1 == m2);
+ assert(m1 != m3);
return 0;
}
diff --git a/libcxx/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/system_category.pass.cpp b/libcxx/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/system_category.pass.cpp
index 7c98a42b52010d..35107061bc366e 100644
--- a/libcxx/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/system_category.pass.cpp
+++ b/libcxx/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/system_category.pass.cpp
@@ -23,47 +23,46 @@
// See https://llvm.org/D65667
struct StaticInit {
- const std::error_category* ec;
- ~StaticInit() {
- std::string str = ec->name();
- assert(str == "system") ;
- }
+ const std::error_category* ec;
+ ~StaticInit() {
+ std::string str = ec->name();
+ assert(str == "system");
+ }
};
static StaticInit foo;
-int main(int, char**)
-{
- {
- const std::error_category& e_cat1 = std::system_category();
- std::error_condition e_cond = e_cat1.default_error_condition(5);
- assert(e_cond.value() == 5);
- assert(e_cond.category() == std::generic_category());
- e_cond = e_cat1.default_error_condition(5000);
- assert(e_cond.value() == 5000);
- assert(e_cond.category() == std::system_category());
- }
+int main(int, char**) {
+ {
+ const std::error_category& e_cat1 = std::system_category();
+ std::error_condition e_cond = e_cat1.default_error_condition(5);
+ LIBCPP_ASSERT(e_cond.value() == 5);
+ LIBCPP_ASSERT(e_cond.category() == std::generic_category());
+ e_cond = e_cat1.default_error_condition(5000);
+ LIBCPP_ASSERT(e_cond.value() == 5000);
+ LIBCPP_ASSERT(e_cond.category() == std::system_category());
+ }
- // Test the result of message(int cond) when given a bad error condition
- {
- errno = E2BIG; // something that message will never generate
- const std::error_category& e_cat1 = std::system_category();
- const std::string msg = e_cat1.message(-1);
- // Exact message format varies by platform.
+ // Test the result of message(int cond) when given a bad error condition
+ {
+ errno = E2BIG; // something that message will never generate
+ const std::error_category& e_cat1 = std::system_category();
+ const std::string msg = e_cat1.message(-1);
+ // Exact message format varies by platform.
#if defined(_AIX)
- LIBCPP_ASSERT(msg.rfind("Error -1 occurred", 0) == 0);
+ LIBCPP_ASSERT(msg.rfind("Error -1 occurred", 0) == 0);
#elif defined(_NEWLIB_VERSION)
- LIBCPP_ASSERT(msg.empty());
+ LIBCPP_ASSERT(msg.empty());
#else
- LIBCPP_ASSERT(msg.rfind("Unknown error", 0) == 0);
+ LIBCPP_ASSERT(msg.rfind("Unknown error", 0) == 0);
#endif
- assert(errno == E2BIG);
- }
+ assert(errno == E2BIG);
+ }
- {
- foo.ec = &std::system_category();
- std::string m = foo.ec->name();
- assert(m == "system");
- }
+ {
+ foo.ec = &std::system_category();
+ std::string m = foo.ec->name();
+ assert(m == "system");
+ }
- return 0;
+ return 0;
}
|
cpplearner
changed the title
system_categorysystem_category-related tests
hawkinsw
reviewed
Jan 21, 2024
| { | ||
| const std::error_category& e_cat1 = std::system_category(); | ||
| std::error_condition e_cond = e_cat1.default_error_condition(5); | ||
| LIBCPP_ASSERT(e_cond.value() == 5); |
There was a problem hiding this comment.
I find this fascinating. Thank you for doing these checks. Does it seem like we should rework this test so that we check whether the result of
e_cat1.default_error_condition(e),where e corresponds to a POSIX errno value), compares equal to
error_condition(e, generic_category())as required by the standard?
ldionne
added
hardening
ldionne
approved these changes
Jan 22, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
eq_error_code_error_code.pass.cpp: The comparison betweenerror_codeanderror_categoryinternally usesdefault_error_conditionto map theerror_codeto its correspondingerror_condition. When theerror_code'scategoryissystem_category, what constitutes correspondence is unspecified.message.pass.cppassumes that the result ofsystem_category().message(5)is equal togeneric_category().message(5).system_category.pass.cppassumes thatsystem_category().default_error_condition(5).value() == 5.Although libc++'s
system_categoryalways behave as if the incoming value is a POSIX error code (and thus is very similar togeneric_category), other implementations do something different on Windows.