From 58dd08ee5072c7f6246baf7d35dbf37806e78ba1 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Mon, 2 May 2016 16:03:27 -0400 Subject: [PATCH] Don't run UTF-8.exp test if newlib is not built with multibyte support. Submitted on behalf of Yuriy Kolerov. newlib/ChangeLog 2016-04-29 Yuriy Kolerov testsuite/newlib.locale/UTF-8.exp: Don't run if multibyte support is disabled. Signed-off-by: Yuriy Kolerov Signed-off-by: Anton Kolesov --- newlib/testsuite/newlib.locale/UTF-8.exp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/newlib/testsuite/newlib.locale/UTF-8.exp b/newlib/testsuite/newlib.locale/UTF-8.exp index e823a4f96..94fcb5f53 100644 --- a/newlib/testsuite/newlib.locale/UTF-8.exp +++ b/newlib/testsuite/newlib.locale/UTF-8.exp @@ -6,6 +6,18 @@ load_lib checkoutput.exp +# Don't run this test if newlib's build does not support multibyte encodings. +set newlib_header_name "$objdir/targ-include/newlib.h" +if [file exists $newlib_header_name] { + set newlib_header_fid [open $newlib_header_name r] + set newlib_header_text [read $newlib_header_fid] + close $newlib_header_fid + if {![regexp "#define _MB_CAPABLE" $newlib_header_text] || \ + [regexp "#define _MB_LEN_MAX 1" $newlib_header_text]} { + return + } +} + set expected_output { "Set C-UTF-8 locale." "* U-00000000"