Browse Source

Merge pull request #1501 from assimp/kimkulling-traviscleanup

Update .travis.sh
Kim Kulling 8 years ago
parent
commit
130c25eadb
1 changed files with 9 additions and 4 deletions
  1. 9 4
      .travis.sh

+ 9 - 4
.travis.sh

@@ -1,3 +1,10 @@
+#---------------------------------------------------------------------------
+#Open Asset Import Library (assimp)
+#---------------------------------------------------------------------------
+# Copyright (c) 2006-2017, assimp team
+#
+# License see LICENSE file
+#
 function generate()
 function generate()
 {
 {
     OPTIONS="-DASSIMP_WERROR=ON"
     OPTIONS="-DASSIMP_WERROR=ON"
@@ -32,7 +39,7 @@ function generate()
 
 
     cmake -G "Unix Makefiles" $OPTIONS
     cmake -G "Unix Makefiles" $OPTIONS
 }
 }
-
+# build and run unittests, if not android
 if [ $ANDROID ]; then
 if [ $ANDROID ]; then
     ant -v -Dmy.dir=${TRAVIS_BUILD_DIR} -f ${TRAVIS_BUILD_DIR}/port/jassimp/build.xml ndk-jni
     ant -v -Dmy.dir=${TRAVIS_BUILD_DIR} -f ${TRAVIS_BUILD_DIR}/port/jassimp/build.xml ndk-jni
 fi
 fi
@@ -41,7 +48,5 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
     && make -j4 \
     && make -j4 \
     && sudo make install \
     && sudo make install \
     && sudo ldconfig \
     && sudo ldconfig \
-    && (cd test/unit; ../../bin/unit) \
-    #&& (cd test/regression; chmod 755 run.py; ./run.py ../../bin/assimp; \
-	#   chmod 755 result_checker.py; ./result_checker.py)
+    && (cd test/unit; ../../bin/unit)
 fi
 fi