From 8b27163c20db3dbf1dc03933396407bdf5b121b4 Mon Sep 17 00:00:00 2001 From: Richard Date: Mon, 29 Jun 2015 22:35:31 -0600 Subject: [PATCH] Fixed: Ensure failing tests fail travis --- .travis.sh | 16 ++++++++++++++++ .travis.yml | 16 +--------------- 2 files changed, 17 insertions(+), 15 deletions(-) create mode 100755 .travis.sh diff --git a/.travis.sh b/.travis.sh new file mode 100755 index 000000000..9f1ea37e9 --- /dev/null +++ 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 index ccc6ff815..66b53f686 100644 --- 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