From: Simon Kobyda <skobyda@redhat.com>
Date: Wed, 29 Aug 2018 07:48:10 +0000 (+0200)
Subject: vsh-table: Fix broken build on centos and rhel
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2853a53f863ce192d9744acba9a878fb445aba16;p=libvirt.git

vsh-table: Fix broken build on centos and rhel

The reason of broken build was that centos and rhel use older version of
glibc. These versions of glibc on these platforms cannot work with newer
unicodes, thus causing functions iswprint() and wcwidth() return
unexpected values causing the vshtabletest to fail. Therefore, let's
replace the new unicode characters causing issues with some older ones
to fix the test suite, as the issue would still persist during runtime.

Signed-off-by: Simon Kobyda <skobyda@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
---

diff --git a/tests/vshtabletest.c b/tests/vshtabletest.c
index 1b07c37c56..9e9c045226 100644
--- a/tests/vshtabletest.c
+++ b/tests/vshtabletest.c
@@ -123,7 +123,7 @@ testUnicode(const void *opaque ATTRIBUTE_UNUSED)
 " Id   名稱                  государство  \n"
 "-----------------------------------------\n"
 " 1    fedora28              running      \n"
-" 2    🙊🙉🙈rhel7.5🙆🙆🙅   running      \n";
+" 2    つへソrhel7.5つへソ   running      \n";
     vshTablePtr table;
 
     table = vshTableNew("Id", "名稱", "государство", NULL);
@@ -131,7 +131,7 @@ testUnicode(const void *opaque ATTRIBUTE_UNUSED)
         goto cleanup;
 
     vshTableRowAppend(table, "1", "fedora28", "running", NULL);
-    vshTableRowAppend(table, "2", "🙊🙉🙈rhel7.5🙆🙆🙅", "running",
+    vshTableRowAppend(table, "2", "つへソrhel7.5つへソ", "running",
                       NULL);
 
     act = vshTablePrintToString(table, true);