Revert "strerror: incl enum name"
Revert submission 1833622-usable-strerror
Reason for revert: b/202330586
Bug: 202330586
Reverted Changes:
I4d8f617a0:Track strerror(3) change.
I8ea86220c:strerror: incl enum name
I407bd9f4d:strerror: incl enum name
Change-Id: I81ed563221a77827084711eadd7fb739aeba52a1
diff --git a/tests/stdio_test.cpp b/tests/stdio_test.cpp
index cf8cb0a..e38dd60 100644
--- a/tests/stdio_test.cpp
+++ b/tests/stdio_test.cpp
@@ -2461,7 +2461,7 @@
ASSERT_STREQ("<Unknown error -1>", buf);
errno = EINVAL;
snprintf(buf, sizeof(buf), "<%m>");
- ASSERT_MATCH(buf, "<Invalid argument.*>");
+ ASSERT_STREQ("<Invalid argument>", buf);
}
TEST(STDIO_TEST, printf_m_does_not_clobber_strerror) {
@@ -2484,7 +2484,7 @@
ASSERT_EQ(std::wstring(L"<Unknown error -1>"), buf);
errno = EINVAL;
swprintf(buf, sizeof(buf), L"<%m>");
- ASSERT_MATCH(buf, L"Invalid argument.*>");
+ ASSERT_EQ(std::wstring(L"<Invalid argument>"), buf);
}
TEST(STDIO_TEST, wprintf_m_does_not_clobber_strerror) {
@@ -2558,9 +2558,9 @@
TEST(STDIO_TEST, perror) {
ExecTestHelper eth;
- eth.Run([&]() { errno = EINVAL; perror("a b c"); exit(0); }, 0, "a b c: Invalid argument.*\n");
- eth.Run([&]() { errno = EINVAL; perror(nullptr); exit(0); }, 0, "Invalid argument.*\n");
- eth.Run([&]() { errno = EINVAL; perror(""); exit(0); }, 0, "Invalid argument.*\n");
+ eth.Run([&]() { errno = EINVAL; perror("a b c"); exit(0); }, 0, "a b c: Invalid argument\n");
+ eth.Run([&]() { errno = EINVAL; perror(nullptr); exit(0); }, 0, "Invalid argument\n");
+ eth.Run([&]() { errno = EINVAL; perror(""); exit(0); }, 0, "Invalid argument\n");
}
TEST(STDIO_TEST, puts) {