strerror: incl enum name
strerror is nice, but usually I don't care about the text, I care about
the uppercase enum
Bug: N/A
Test: ./tests/run-on-host.sh glibc (existing failures -> b/201305529)
Test: atest bionic-unit-tests-static
Test: atest malloc_debug_unit_tests
Change-Id: I407bd9f4dfa918fff66a0da7df8d7239f789c7b8
diff --git a/tests/utils.h b/tests/utils.h
index 284140a..90fb1d0 100644
--- a/tests/utils.h
+++ b/tests/utils.h
@@ -44,6 +44,7 @@
#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/"
@@ -259,9 +260,7 @@
std::string error_msg("Test output:\n" + output_);
AssertChildExited(pid, expected_exit_status, &error_msg);
if (expected_output_regex != nullptr) {
- if (!std::regex_search(output_, std::regex(expected_output_regex))) {
- FAIL() << "regex " << expected_output_regex << " didn't match " << output_;
- }
+ ASSERT_MATCH(output_, expected_output_regex);
}
}