From d3af15bbb2f67edc90b9729d329e29530e14d544 Mon Sep 17 00:00:00 2001
From: Chris Beck <render787@gmail.com>
Date: Mon, 30 Jun 2014 14:28:44 -0400
Subject: [PATCH] refactor travis script, add a variable for the utf8 check

---
 .travis.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6d86989bf04f..2cb1f7752484 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,9 +13,11 @@ before_install:
     - export TARGETS="wesnoth wesnothd campaignd test"
     - export WML_TESTS=true
     - export CPP_TESTS=true
+    - export CHECK_UTF8=true
     - if [ "$CXX" = "g++" ]; then export TARGETS="wesnoth test"; fi
     - if [ "$CXX" = "g++" ]; then export WML_TESTS=false; fi
 #    - if [ "$CXX" = "g++" ]; then export CPP_TESTS=false; fi
+    - if [ "$CXX" = "g++" ]; then export CHECK_UTF8=false; fi
     - if [ "$CXX" = "g++" ]; then time sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y; fi
     - if [ "$CXX" = "g++" ]; then time sudo apt-get update -qq; fi
     - if [ "$CXX" = "g++" ]; then time sudo apt-get install g++-4.8; fi
@@ -23,9 +25,9 @@ before_install:
 install:
     - time sudo apt-get update -qq
     - time sudo apt-get install -qq libboost-iostreams-dev libboost-program-options-dev libboost-regex-dev libboost-system-dev libboost-test-dev libcairo2-dev libfribidi-dev libpango1.0-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev
-    - if [ "$CXX" = "clang++" ]; then time sudo apt-get install -qq moreutils; fi
+    - if [ "$CHECK_UTF8" = true ]; then time sudo apt-get install -qq moreutils; fi
 script: 
-    - if [ "$CXX" = "clang++" ]; then time ./utils/travis/check_utf8.sh; fi
+    - if [ "$CHECK_UTF8" = true ]; then time ./utils/travis/check_utf8.sh; fi
     - scons cxxtool=$CXX --debug=time strict=$STRICT_COMPILATION $TARGETS
     - "export DISPLAY=:99.0"
     - "sh -e /etc/init.d/xvfb start"