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/string_test.cpp b/tests/string_test.cpp
index 1b0082f..8d3fb68 100644
--- a/tests/string_test.cpp
+++ b/tests/string_test.cpp
@@ -28,8 +28,6 @@
#include <algorithm>
#include <vector>
-#include <android-base/test_utils.h>
-
#include "buffer_tests.h"
#if defined(NOFORTIFY)
@@ -60,7 +58,7 @@
TEST(STRING_TEST, strerror) {
// Valid.
ASSERT_STREQ("Success", strerror(0));
- ASSERT_MATCH(strerror(1), "Operation not permitted.*");
+ ASSERT_STREQ("Operation not permitted", strerror(1));
// Invalid.
ASSERT_STREQ("Unknown error -1", strerror(-1));
@@ -108,9 +106,9 @@
#if defined(__BIONIC__)
ASSERT_STREQ("Success", buf);
#endif
- ASSERT_MATCH(strerror_r(1, buf, sizeof(buf)), "Operation not permitted.*");
+ ASSERT_STREQ("Operation not permitted", strerror_r(1, buf, sizeof(buf)));
#if defined(__BIONIC__)
- ASSERT_MATCH(buf, "Operation not permitted.*");
+ ASSERT_STREQ("Operation not permitted", buf);
#endif
// Invalid.