diff --git a/.travis.yml b/.travis.yml index a798b4043e528a208eba8f00135f2023ae172b0c..750d0b2912bae1864bea6c7e8603581046866dd5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -65,9 +65,11 @@ before_script: script: - javac -version - ./bootstrap && ./configure --prefix=/usr && make - - pushd bindings/java/ - - ant -q dist - - ant test + - pushd bindings/java/ && ant -q dist + # don't run tests on linux; libtsk not present due to SIP on osx: VIK-6971 + - if [ $TRAVIS_OS_NAME != "osx" ]; then + ant -q test + fi - popd - pushd case-uco/java/ && ant -q && popd - make check && if [ -f "tests/test-suite.log" ];then cat tests/test-suite.log; fi ; if [ -f "unit_tests/base/test-suite.log" ];then cat unit_tests/base/test-suite.log; fi diff --git a/travis_install_libs.sh b/travis_install_libs.sh index 1482ea50f4a028961bf34ec05678405d5e2a957f..05812f1f5b50470eaaeed3e878480fcfe006dcfc 100755 --- a/travis_install_libs.sh +++ b/travis_install_libs.sh @@ -16,6 +16,3 @@ installLib() { installLib libvhdi 20201018 installLib libvmdk 20200926 -echo "directories:" -ls /usr/lib -ls /usr/local/lib \ No newline at end of file