Skip to content

Commit f2792cc

Browse files
committed
install pkg-config. skip collision test for old bullet.
1 parent 2ce0892 commit f2792cc

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

.travis.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ if [ "$TRAVIS_OS_NAME" == "linux" ]; then
2828
travis_time_end
2929

3030
travis_time_start setup.apt-get_install
31-
ret=1; while [ $ret != 0 ]; do sudo apt-get install -qq -y git make gcc g++ libjpeg-dev libxext-dev libx11-dev libgl1-mesa-dev libglu1-mesa-dev libpq-dev libpng-dev xfonts-100dpi xfonts-75dpi libbullet-dev && ret=0 || echo "failed, retry"; done # msttcorefonts could not install on 14.04 travis
31+
ret=1; while [ $ret != 0 ]; do sudo apt-get install -qq -y git make gcc g++ libjpeg-dev libxext-dev libx11-dev libgl1-mesa-dev libglu1-mesa-dev libpq-dev libpng-dev xfonts-100dpi xfonts-75dpi pkg-config libbullet-dev && ret=0 || echo "failed, retry"; done # msttcorefonts could not install on 14.04 travis
3232
if [ "`uname -m`" == "x86_64" ] ; then sudo apt-get install -qq -y texlive-latex-base ptex-bin latex2html nkf poppler-utils || echo "ok"; fi # 16.04 does ont have ptex bin
3333
travis_time_end
3434

@@ -172,6 +172,9 @@ fi
172172
for test_l in irteus/test/*.l; do
173173

174174
[[ ("`uname -m`" == "arm"* || "`uname -m`" == "aarch"*) && $test_l =~ geo.l|mathtest.l|interpolator.l|test-irt-motion.l|test-pointcloud.l|irteus-demo.l ]] && continue;
175+
# skip collision test because bullet of 2.83 or later version is not released in trusty and jessie.
176+
# https://github.com/euslisp/jskeus/blob/6cb08aa6c66fa8759591de25b7da68baf76d5f09/irteus/Makefile#L37
177+
[[ ( "$DOCKER_IMAGE" == *"trusty"* || "$DOCKER_IMAGE" == *"jessie"* ) && $test_l =~ test-collision.l ]] && continue;
175178

176179
travis_time_start irteus.${test_l##*/}.test
177180

0 commit comments

Comments
 (0)