From 48619f39e7f8e7f96820b6ff96d8e84b1888550c Mon Sep 17 00:00:00 2001
From: yangyaming <mxscmxsc@gmail.com>
Date: Fri, 17 Nov 2017 17:18:13 +0800
Subject: [PATCH] Fix travis.

---
 .travis.yml         | 16 +++++++++++-----
 .travis/unittest.sh |  9 +--------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index eadcb03b..52bfd5a1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,20 +17,26 @@ addons:
       - python-pip
       - python2.7-dev
   ssh_known_hosts: 52.76.173.135
+
 before_install:
   -  sudo pip install -U virtualenv pre-commit pip
   -  docker pull paddlepaddle/paddle:latest
+
 script:
-  -  .travis/precommit.sh
-  -  docker run -i --rm -v "$PWD:/py_unittest" paddlepaddle/paddle:latest /bin/bash -c
-    'cd /py_unittest; sh .travis/unittest.sh' || exit $?
+  - exit_code=0
+  - .travis/precommit.sh || exit_code=$(( exit_code | $? ))
+  - docker run -i --rm -v "$PWD:/py_unittest" paddlepaddle/paddle:latest /bin/bash -c
+    'cd /py_unittest; sh .travis/unittest.sh' || exit_code=$(( exit_code | $? ))
   - |
-    if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then exit 0; fi;
-    if [[ "$TRAVIS_BRANCH" != "develop"  && ! "$TRAVIS_BRANCH" =~ ^v[[:digit:]]+\.[[:digit:]]+(\.[[:digit:]]+)?(-\S*)?$ ]]; then echo "not develop branch, no deploy"; exit 0; fi;
+    if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then exit $exit_code; fi;
+    if [[ "$TRAVIS_BRANCH" != "develop"  && ! "$TRAVIS_BRANCH" =~ ^v[[:digit:]]+\.[[:digit:]]+(\.[[:digit:]]+)?(-\S*)?$ ]]; then echo "not develop branch, no deploy"; exit $exit_code; fi;
     export DEPLOY_DOCS_SH=https://raw.githubusercontent.com/PaddlePaddle/PaddlePaddle.org/master/scripts/deploy/deploy_docs.sh
     export MODELS_DIR=`pwd`
     cd ..
     curl $DEPLOY_DOCS_SH | bash -s $CONTENT_DEC_PASSWD $TRAVIS_BRANCH $MODELS_DIR
+    exit_code=$(( exit_code | $? ))
+    exit $exit_code
+
 notifications:
   email:
     on_success: change
diff --git a/.travis/unittest.sh b/.travis/unittest.sh
index 4195a441..f27dc481 100755
--- a/.travis/unittest.sh
+++ b/.travis/unittest.sh
@@ -24,13 +24,6 @@ unittest(){
 trap 'abort' 0
 set -e
 
-for proj in */ ; do
-    if [ -d $proj ]; then
-        unittest $proj
-        if [ $? != 0 ]; then
-            exit 1
-        fi
-    fi
-done
+unittest .
 
 trap : 0