From a309e017bfb7935ddeaa81b475186f3e6f39d7d6 Mon Sep 17 00:00:00 2001
From: Darshit Shah <address@hidden>
Date: Tue, 8 Dec 2015 14:45:01 +0100
Subject: [PATCH 2/2] Re-enable test on multibyte locale in Travis

* .travis.yml: Use Russian locale instead of Japanese since it seems to
be more complete
* contrib/travis-ci: Re-enable testing on a Russian locale
---
 .travis.yml       | 5 ++---
 contrib/travis-ci | 9 ++-------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bb9017b..347f0b8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,8 +9,7 @@ notifications:
     email:
         recipients:
             - address@hidden
-            - address@hidden
-        on_success: change
+        on_success: always
         on_failure: always
 
 env:
@@ -42,7 +41,7 @@ addons:
             - python3
             - valgrind
             - language-pack-tr
-            - language-pack-ja
+            - language-pack-ru
 
 script:
     - make distclean || true
diff --git a/contrib/travis-ci b/contrib/travis-ci
index 6694094..90ce300 100755
--- a/contrib/travis-ci
+++ b/contrib/travis-ci
@@ -14,7 +14,7 @@ esac
 # For some reason. /proc/cpuinfo reports 16 cores on Travis, while the docs
 # claim that each instance has only 2 cores. We believe the docs and force a
 # value of only 2 here.
-CORES=2
+CORES=3
 
 # Define a large number of Warning flags for the compiler. Hopefully, someone
 # will sit and analyze the output to clean the warnings from the codebase.
@@ -34,12 +34,7 @@ for options in "" "--disable-ipv6"; do
   echo "  ./configure $DISTCHECK_CONFIGURE_FLAGS CFLAGS=\"$CFLAGS\""
   ./configure $DISTCHECK_CONFIGURE_FLAGS CFLAGS="$CFLAGS"
 
-  # We would like to have more languages tested here. Currently, there is a
-  # problem in the translations file for Turkish which causes the progress bar
-  # to assert fail. Apart from that, at least one another language with multi
-  # byte and multi column characters.
-  # TODO: Add Japanese and Turkish LANG for test
-  for xLCALL in C; do
+  for xLCALL in "ru_RU.UTF-8" "C" "tr_TR.UTF-8"; do
     export TESTS_ENVIRONMENT="LC_ALL=$xLCALL VALGRIND_TESTS=1"
     echo "    TESTS_ENVIRONMENT=\"$TESTS_ENVIRONMENT\" make distcheck CFLAGS=$CFLAGS -j$CORES"
     make distcheck CFLAGS="$CFLAGS" -j$CORES
-- 
2.6.3