Fixed: Ensure failing tests fail travis

omni360 · Jul 1, 2015 · 8b27163 · 8b27163
1 parent 2dc332c
commit 8b27163
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/.travis.sh b/.travis.sh
@@ -0,0 +1,16 @@
+function generate()
+{
+    cmake -G "Unix Makefiles" -DASSIMP_ENABLE_BOOST_WORKAROUND=YES -DASSIMP_NO_EXPORT=$TRAVIS_NO_EXPORT -DBUILD_SHARED_LIBS=$SHARED_BUILD
+}
+
+if [ $ANDROID ]; then 
+    ant -v -Dmy.dir=${TRAVIS_BUILD_DIR} -f ${TRAVIS_BUILD_DIR}/port/jassimp/build.xml ndk-jni
+else
+    generate \
+    && make \
+    && sudo make install \
+    && sudo ldconfig \
+    && (cd test/unit; ../../bin/unit) \
+    && (cd test/regression; chmod 755 run.py; ./run.py) \
+    && (cd test/regression; chmod 755 result_checker.py; ./result_checker.py)
+fi
diff --git a/.travis.yml b/.travis.yml
@@ -28,18 +28,4 @@ install:
   - if [ $ANDROID ]; then wget -c http://dl.google.com/android/ndk/android-ndk-${PV}-${PLATF}.tar.bz2 && tar xf android-ndk-${PV}-${PLATF}.tar.bz2 ; fi
 
 script:
-  - if [ $ANDROID ]; then 
-    ant -v -Dmy.dir=${TRAVIS_BUILD_DIR} -f ${TRAVIS_BUILD_DIR}/port/jassimp/build.xml ndk-jni ;
-    else
-    cmake -G "Unix Makefiles" -DASSIMP_ENABLE_BOOST_WORKAROUND=YES -DASSIMP_NO_EXPORT=$TRAVIS_NO_EXPORT -DBUILD_SHARED_LIBS=$SHARED_BUILD ;
-    make ;
-    sudo make install ;
-    sudo ldconfig ;
-    cd test/unit ;
-    ../../bin/unit ;
-    cd ../regression ;
-    chmod 755 run.py ;
-    ./run.py ;
-    chmod 755 result_checker.py ;
-    ./result_checker.py;
-    fi
+  - . ./.travis.sh