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/utils.h b/tests/utils.h
index 90fb1d0..284140a 100644
--- a/tests/utils.h
+++ b/tests/utils.h
@@ -44,7 +44,6 @@
#include <android-base/macros.h>
#include <android-base/scopeguard.h>
#include <android-base/stringprintf.h>
-#include <android-base/test_utils.h>
#if defined(__LP64__)
#define PATH_TO_SYSTEM_LIB "/system/lib64/"
@@ -260,7 +259,9 @@
std::string error_msg("Test output:\n" + output_);
AssertChildExited(pid, expected_exit_status, &error_msg);
if (expected_output_regex != nullptr) {
- ASSERT_MATCH(output_, expected_output_regex);
+ if (!std::regex_search(output_, std::regex(expected_output_regex))) {
+ FAIL() << "regex " << expected_output_regex << " didn't match " << output_;
+ }
}
}