commit a98a5fb63ee00bbd7f1663192453efcdf117cb92
author Anders Lewis <agloo@google.com> Wed Aug 09 16:52:19 2017 -0700
committer Anders Lewis <agloo@google.com> Wed Aug 09 17:24:13 2017 -0700
tree ca3ade0c20e9bb89f76e4ae37e9d3fde00a264f1
parent ac4f4b43a3d19f40fc1138c5f78a3d5afd535935

Improve error handling and fix minor bugs in bionic benchmarks.

Test: Unit tests.
Change-Id: I224ae4c7f195176eb8a87deddb2debcbf0f24ba3

benchmarks/stdlib_benchmark.cpp

diff --git a/benchmarks/stdlib_benchmark.cpp b/benchmarks/stdlib_benchmark.cpp
index 7a12eb6..eb325ab 100644
--- a/benchmarks/stdlib_benchmark.cpp
+++ b/benchmarks/stdlib_benchmark.cpp
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include <err.h>
 #include <langinfo.h>
 #include <locale.h>
 #include <stdlib.h>
@@ -47,7 +48,9 @@
   || setlocale(LC_CTYPE, "en.UTF-8")
   || setlocale(LC_CTYPE, "de_DE-8")
   || setlocale(LC_CTYPE, "fr_FR-8");
-  if (strcmp(nl_langinfo(CODESET), "UTF-8")) abort();
+  if (strcmp(nl_langinfo(CODESET), "UTF-8")) {
+    errx(1, "ERROR: unable to set locale in BM_stdlib_mbstowcs");
+  }
 
   char* buf_aligned = GetAlignedPtr(&buf, buf_alignment, 500000);
   wchar_t* widebuf_aligned = GetAlignedPtr(&widebuf, widebuf_alignment, 500000);
@@ -86,7 +89,9 @@
   || setlocale(LC_CTYPE, "en.UTF-8")
   || setlocale(LC_CTYPE, "de_DE-8")
   || setlocale(LC_CTYPE, "fr_FR-8");
-  if (strcmp(nl_langinfo(CODESET), "UTF-8")) abort();
+  if (strcmp(nl_langinfo(CODESET), "UTF-8")) {
+    errx(1, "ERROR: unable to set locale in BM_stdlib_mbrtowc");
+  }
 
   char* buf_aligned = GetAlignedPtr(&buf, buf_alignment, 500000);
   size_t i, j, k, l;