From 7732a35625643054548bbb986558fef796f93b54 Mon Sep 17 00:00:00 2001
From: Edouard DUPIN <yui.heero@gmail.com>
Date: Mon, 24 Oct 2016 22:23:26 +0200
Subject: [PATCH] [CI] correct travis CI

---
 .travis.yml | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0979900..674a704 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 language: cpp
 
-sudo: false
+sudo: required
+dist: trusty
 
 branches:
   only:
@@ -14,9 +15,9 @@ addons:
     packages:
       - g++-4.9
       - expect
-      #- binutils-mingw-w64-x86-64 # 64bit MinGW
-      #- gcc-mingw-w64-x86-64
-      #- g++-mingw-w64-x86-64
+      - binutils-mingw-w64-x86-64 # 64bit MinGW
+      - gcc-mingw-w64-x86-64
+      - g++-mingw-w64-x86-64
 
 matrix:
   include:
@@ -26,12 +27,12 @@ matrix:
     - os: linux
       env: CONF=debug BUILDER=clang TARGET=Linux
       compiler: clang
-    #- os: linux
-    #  env: CONF=release BUILDER=gcc TARGET=Windows TAG=Mingw
-    #  compiler: x86_64-w64-mingw32-gcc
-    #- os: linux
-    #  env: CONF=release BUILDER=gcc TARGET=Android TAG=Android DISABLE_PACKAGE=-p
-    #  compiler: gcc
+    - os: linux
+      env: CONF=release BUILDER=gcc TARGET=Windows TAG=Mingw
+      compiler: x86_64-w64-mingw32-gcc
+    - os: linux
+      env: CONF=release BUILDER=gcc TARGET=Android TAG=Android DISABLE_PACKAGE=-p
+      compiler: gcc
     - os: osx
       env: CONF=release BUILDER=clang TARGET=MacOs TAG=MacOs
       compiler: clang
@@ -52,6 +53,8 @@ install:
 
 before_script:
   - cd ..
+  - git clone https://github.com/atria-soft/elog.git -b $TRAVIS_BRANCH
+  - git clone https://github.com/atria-soft/ememory.git -b $TRAVIS_BRANCH
   - git clone https://github.com/atria-soft/etk.git -b $TRAVIS_BRANCH
   - git clone https://github.com/atria-soft/esvg.git -b $TRAVIS_BRANCH
   - git clone https://github.com/atria-soft/exml.git -b $TRAVIS_BRANCH
@@ -67,14 +70,14 @@ before_script:
   - ./ci/build_send.py --tag=$TAG --status=START;
 
 script:
-  - lutin -w -j4 -C -P -t$TARGET -c $BUILDER $COMPILATOR_OPTION $BUS -m $CONF $GCOV $DISABLE_PACKAGE egami-test; STATUS=$?
+  - lutin -w -j4 -C -P -t $TARGET -c $BUILDER $COMPILATOR_OPTION $BUS -m $CONF $GCOV $DISABLE_PACKAGE egami-test; STATUS=$?
   - ./ci/build_send.py --tag=$TAG --status="$STATUS";
 
 after_script:
   - if [ "$GCOV" != "" ]; then
         ./ci/warning_send.py --find-path ./out/Linux_x86_64/$CONF/build/$BUILDER/egami/;
     fi
-  - ./out/Linux_x86_64/$CONF/staging/$BUILDER/egami-test/egami-test.app/bin/egami-test --etk-log-level=3 | tee out_test.txt
+  - ./out/Linux_x86_64/$CONF/staging/$BUILDER/egami-test/egami-test.app/bin/egami-test --elog-level=3 | tee out_test.txt
   - if [ "$GCOV" != "" ]; then
         ./ci/test_send.py --file=out_test.txt;
         lutin -C -P -t $TARGET -c $BUILDER $COMPILATOR_OPTION $BUS -m $CONF -p egami?gcov;