diff options
| author | Christopher Ferris <cferris@google.com> | 2017-08-11 02:04:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-08-11 02:04:47 +0000 |
| commit | 30438e4cea83628bcacbedff37a35398bb8b40e7 (patch) | |
| tree | d0dab96c8f737ae4058b1e144ced6418823b5b77 /benchmarks/stdlib_benchmark.cpp | |
| parent | 73c3be22199a42bed53245b9b648e276de0b6422 (diff) | |
| parent | a98a5fb63ee00bbd7f1663192453efcdf117cb92 (diff) | |
Merge "Improve error handling and fix minor bugs in bionic benchmarks."
Diffstat (limited to 'benchmarks/stdlib_benchmark.cpp')
| -rw-r--r-- | benchmarks/stdlib_benchmark.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/benchmarks/stdlib_benchmark.cpp b/benchmarks/stdlib_benchmark.cpp index 7a12eb6eb..eb325abbb 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 @@ static void BM_stdlib_mbstowcs(benchmark::State& state) { || 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 @@ static void BM_stdlib_mbrtowc(benchmark::State& state) { || 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; |