From 40b78f5183f66958b333d8a54f0ab25a9576be5e Mon Sep 17 00:00:00 2001
From: Valdis Vitolins <valdis.vitolins@odo.lv>
Date: Sun, 23 May 2021 14:58:17 +0300
Subject: [PATCH] Add handling of Ignore message for all test functions

---
 tests/common | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/common b/tests/common
index 6ff51912..eed9010d 100755
--- a/tests/common
+++ b/tests/common
@@ -58,8 +58,8 @@ test_phon() {
     ESPEAK_DATA_PATH=`pwd` LD_LIBRARY_PATH=src:${LD_LIBRARY_PATH} \
         src/espeak-ng -xq ${OPTIONS} -v ${TEST_LANG} "${TEST_TEXT}" > actual.txt
     echo "${EXPECTED}" > expected.txt
-    if [ "$MESSAGE" = "broken" ] ; then
-        diff expected.txt actual.txt || (echo "... ignoring error (broken)" && true)
+    if [ "$MESSAGE" = "Ignore" ] ; then
+        diff expected.txt actual.txt || (echo "... ignoring error" && true)
     else
         diff expected.txt actual.txt || exit 1
     fi
@@ -72,16 +72,16 @@ test_wav () {
         TEST_TEXT=$3
         MESSAGE=$4
 
-        if [ -n "$MESSAGE" ] ; then
-            MESSAGE=" $MESSAGE"
-        fi
-
         echo "testing ${VOICE}${MESSAGE}"
         ESPEAK_DATA_PATH=`pwd` LD_LIBRARY_PATH=src:${LD_LIBRARY_PATH} \
         src/espeak-ng --stdout -v ${VOICE} "${TEST_TEXT}" | \
         $sha1sum | awk '{ print $1 }' > actual.txt
         echo "${EXPECTED}" > expected.txt
-        diff expected.txt actual.txt || exit 1
+        if [ "$MESSAGE" = "Ignore" ] ; then
+            diff expected.txt actual.txt || (echo "... ignoring error" && true)
+        else
+            diff expected.txt actual.txt || exit 1
+        fi
 }
 
 # Check generated wav file from list of phonemes
@@ -104,8 +104,8 @@ test_replace() {
     echo "testing ${TEST_LANG}"
     ESPEAK_DATA_PATH=`pwd` LD_LIBRARY_PATH=src:${LD_LIBRARY_PATH} \
         src/espeak-ng -Xq -v ${TEST_LANG} "${TEST_TEXT}" | grep -E "(Translate|Found:) " | sed -e 's/ \[.*][ ]*$//g' > actual.txt
-    if [ "$MESSAGE" = "broken" ] ; then
-        diff expected.txt actual.txt || (echo "... ignoring error (broken)" && true)
+    if [ "$MESSAGE" = "Ignore" ] ; then
+        diff expected.txt actual.txt || (echo "... ignoring error" && true)
     else
         diff expected.txt actual.txt || exit 1
     fi