From c179bade5ffae6c5237fccc22f10abbe771b2be2 Mon Sep 17 00:00:00 2001
From: Greg DiCristofaro <gregd@basistech.com>
Date: Thu, 5 Nov 2020 11:02:22 -0500
Subject: [PATCH] fix for running in travis on os-x
---
.travis.yml | 8 +++++---
travis_install_libs.sh | 3 ---
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index a798b4043..750d0b291 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 1482ea50f..05812f1f5 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
--
GitLab