Skip to content

Commit

Permalink
[.travis.yml, hrpsys_ros_bridge/catkin.cmake] Enable travis euslisp t…
Browse files Browse the repository at this point in the history
…est using USE_DEB=source and reducing make jobs and loads
  • Loading branch information
snozawa committed Aug 29, 2015
1 parent 8b1d36f commit d3696a5
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ env:
matrix:
- ROS_DISTRO=hydro USE_DEB=true
- ROS_DISTRO=hydro USE_DEB=false NOT_TEST_INSTALL=true
- ROS_DISTRO=hydro USE_DEB=false NOT_TEST_INSTALL=true EXTRA_DEB="ros-hydro-roseus ros-hydro-euscollada ros-hydro-pr2eus" CATKIN_PARALLEL_JOBS='-p1'
- ROS_DISTRO=hydro USE_DEB=source NOT_TEST_INSTALL=true EXTRA_DEB="ros-hydro-roseus ros-hydro-euscollada ros-hydro-pr2eus" ROS_PARALLEL_JOBS="-j1 -l1" IS_EUSLISP_TRAVIS_TEST="true"
- ROS_DISTRO=hydro USE_DEB=true NOT_TEST_INSTALL=true INSTALL_SRC="https://github.com/start-jsk/rtmros_tutorials" TEST_PKGS="hrpsys_ros_bridge_tutorials" INSTALL_SRC_SECURE="[email protected]:start-jsk/rtmros_hrp2" TEST_PKGS_SECURE="jsk_hrp2_ros_bridge"
- ROS_DISTRO=hydro USE_DEB=source NOT_TEST_INSTALL=true
- ROS_DISTRO=indigo USE_DEB=true
Expand All @@ -43,7 +43,7 @@ before_script:
- export REPOSITORY_NAME=`basename $PWD`
- if [ "${INSTALL_SRC}" != "" ] ;then sudo apt-get install python-yaml; rm .rosinstall; for src in $INSTALL_SRC; do name=`basename $src`; python -c "import yaml;print yaml.dump([{'git':{'uri':'$src','local-name':'$name'}}], default_flow_style=False)" >> .rosinstall; done; cat .rosinstall; export USE_DEB=false; fi; # set USE_DEB false to enable .rosinstall
script:
- export ROS_PARALLEL_JOBS="-j2 -l2"
- if [ "${IS_EUSLISP_TRAVIS_TEST}" != "true" ] ; then export ROS_PARALLEL_JOBS="-j2 -l2" ; fi
- if [ "${TEST_TYPE}" == "" ] ; then source .travis/travis.sh; else source ./.travis_test.sh ; fi
after_success:
- TRAVIS_JOB_SUBNUMBER="${TRAVIS_JOB_NUMBER##*.}"
Expand Down
8 changes: 6 additions & 2 deletions hrpsys_ros_bridge/catkin.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,10 @@ add_rostest(test/test-import-python.test)
# call catkin depends
find_package(catkin COMPONENTS roseus QUIET)
if(roseus_FOUND)
generate_eusdoc(euslisp/rtm-ros-robot-interface.l)
add_rostest(test/hrpsys-samples/test_samplerobot_euslisp_unittests.launch)
if ("true" STREQUAL "$ENV{IS_EUSLISP_TRAVIS_TEST}")
message("Execute rostest for euslisp unittest")
add_rostest(test/hrpsys-samples/test_samplerobot_euslisp_unittests.launch)
else()
generate_eusdoc(euslisp/rtm-ros-robot-interface.l)
endif()
endif()

0 comments on commit d3696a5

Please sign in to comment.