1 files changed, 15 insertions, 4 deletions
diff --git a/localedata/tst-locale.sh b/localedata/tst-locale.sh
index c73c1087d3..2d7da3c4a1 100755
--- a/localedata/tst-locale.sh
+++ b/localedata/tst-locale.sh
@@ -34,18 +34,29 @@ test_locale ()
     if test $rep; then
       rep="--repertoire-map $rep"
     fi
+    # We expect the test locales to fail with warnings, they are mostly
+    # incomplete and used for testing purposes, but that is OK.
+    ret=0
     ${localedef_before_env} \
     ${run_program_env} \
     I18NPATH=. \
     ${localedef_after_env} --quiet -c -f $charmap -i $input \
-      ${rep} ${common_objpfx}localedata/$out
-
-    if [ $? -ne 0 ]; then
+      ${rep} ${common_objpfx}localedata/$out || ret=$?
+    # Any error greater than one means we ran into an implementation
+    # defined limit or saw an error that caused the output not to
+    # be written, or lastly saw a fatal error that terminated
+    # localedef.
+    if [ $ret -gt 1 ]; then
 	echo "Charmap: \"${charmap}\" Inputfile: \"${input}\"" \
 	     "Outputdir: \"${out}\" failed"
 	exit 1
     else
-	echo "locale $out generated succesfully"
+	echo -n "locale $out generated succesfully"
+        if [ $ret -eq 1 ]; then
+	    echo " (with warnings)"
+        else
+	    echo " (without warnings)"
+        fi
     fi
 }