Merge pull request #20 from tork-a/patch-1

Quote environmental variables values, closes #18

.travis.sh

@@ -210,6 +210,15 @@ set +e
 if [[ "`uname -m`" == "aarch"* ]]; then
     sed -i 's@00000@0000@' $CI_SOURCE_PATH/test/object.l $CI_SOURCE_PATH/test/coords.l
 fi
+# arm target (ubuntu_arm64/trusty) takes too long time (>50min) for test
+# osrf/ubuntu_arm64:trusty takes >50 min, reduce loop count for irteus-demo.l
+if [[ "$DOCKER_IMAGE" == *"arm"* ]]; then
+    sed -i 's@00000@0@' $CI_SOURCE_PATH/test/object.l $CI_SOURCE_PATH/test/coords.l
+    sed -i 's@do-until-key-counter 10@do-until-key-counter 1@' irteus/test/irteus-demo.l;
+    sed -i 's/h7/ape/' irteus/test/test-cad.l
+    sed -i 's/(hanoi-program (length \*disks\*))/(subseq (hanoi-program (length \*disks\*)) 0 2)/' irteus/demo/hanoi-arm.l
+    sed -i 's/^\s*footstep-list/(subseq footstep-list 0 3)/' irteus/demo/walk-motion.l
+fi
 
     # run test in EusLisp/test
     for test_l in $CI_SOURCE_PATH/test/*.l; do
@@ -268,6 +277,8 @@ fi
         # skip collision test because bullet of 2.83 or later version is not released in trusty and jessie.
         # https://github.com/euslisp/jskeus/blob/6cb08aa6c66fa8759591de25b7da68baf76d5f09/irteus/Makefile#L37
         if [[ ( "$DOCKER_IMAGE" == *"trusty"* || "$DOCKER_IMAGE" == *"jessie"* ) && $test_l =~ test-collision.l ]]; then export CONTINUE=1; fi
+        # skip if test-cad.l/graph.l for arm
+        if [[ "$DOCKER_IMAGE" == *"arm"* && $test_l =~ test-collision.l|test-cad.l|graph.l ]]; then export CONTINUE=1; fi
 
         if [[ $CONTINUE == 0 ]]; then travis_time_end `expr 32 - $TMP_EXIT_STATUS`; else travis_time_end 33; fi
 

.travis.yml

@@ -24,7 +24,7 @@ matrix:
     - env: QEMU=arm DOCKER_IMAGE=arm32v7/debian:jessie # armhf
     # hppa
     # hurd-i386
-    - env: QEMU=i386 DOCKER_IMAGE=i386/debian:unstable # i386
+    - env: QEMU=i386 DOCKER_IMAGE=i386/debian:buster # i386
     # ia64
     # m68k
     - env: QEMU=mips64el DOCKER_IMAGE=loongnix/debian:buster # mips64el

env-hooks/99.euslisp.sh.in

@@ -1,5 +1,4 @@
 export ARCHDIR=@ARCHDIR@
 export EUSDIR="@CMAKE_INSTALL_PREFIX@/share/euslisp/jskeus/eus/"
-export LD_LIBRARY_PATH=$EUSDIR/$ARCHDIR/lib:$LD_LIBRARY_PATH
-export PATH=$EUSDIR/$ARCHDIR/bin:$PATH
-
+export LD_LIBRARY_PATH="$EUSDIR/$ARCHDIR/lib:$LD_LIBRARY_PATH"
+export PATH="$EUSDIR/$ARCHDIR/bin:$PATH"