skip install test on indigo

jsk-ros-pkg · Sep 14, 2021 · 2e09c6b · 2e09c6b
1 parent cd2fd1c
commit 2e09c6b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/.github/workflows/indigo.yml b/.github/workflows/indigo.yml
@@ -34,3 +34,4 @@ jobs:
           # latest catkin_virtualenv with pip==21.0.1 is incompatible with python 2.x
           # https://github.com/jsk-ros-pkg/jsk_3rdparty/pull/237
           BEFORE_SCRIPT : "sudo pip install virtualenv==15.1.0"
+          NOT_TEST_INSTALL : true
diff --git a/.travis.yml b/.travis.yml
@@ -32,8 +32,8 @@ env:
     - USE_DOCKER=true
   matrix:
     - CHECK_PYTHON3_COMPILE=true
-    - ROS_DISTRO=indigo USE_DEB=true ROS_REPOSITORY_PATH='http://packages.ros.org/ros/ubuntu' ROS_PYTHON_VERSION=2
-    - ROS_DISTRO=indigo USE_DEB=true ROS_PYTHON_VERSION=2
+    - ROS_DISTRO=indigo USE_DEB=true ROS_REPOSITORY_PATH='http://packages.ros.org/ros/ubuntu' ROS_PYTHON_VERSION=2 NOT_TEST_INSTALL=true
+    - ROS_DISTRO=indigo USE_DEB=true ROS_PYTHON_VERSION=2 NOT_TEST_INSTALL=true
     # FIXME: kinetic test fails because of matplotlib
     # see: https://github.com/matplotlib/matplotlib/issues/9789
     - ROS_DISTRO=kinetic BEFORE_SCRIPT="pip install --user matplotlib==2.2.5" USE_DEB=true

diff --git a/jsk_rviz_plugins/CMakeLists.txt b/jsk_rviz_plugins/CMakeLists.txt
@@ -245,9 +245,11 @@ if (CATKIN_ENABLE_TESTING)
   add_dependencies(tests ${PROJECT_NAME}_install_sample_data)
   # run rostest for melodic+
   find_package(rostest REQUIRED)
-  file(GLOB TEST_FILES test/*.test)
-  foreach(TEST_FILE ${TEST_FILES})
-    message(STATUS "Run test for ${TEST_FILE}")
-    add_rostest(${TEST_FILE})
-  endforeach()
+  if("$ENV{ROS_DISTRO}" STRGREATER "indigo") # support from kinetic
+    file(GLOB TEST_FILES test/*.test)
+    foreach(TEST_FILE ${TEST_FILES})
+      message(STATUS "Run test for ${TEST_FILE}")
+      add_rostest(${TEST_FILE})
+    endforeach()
+  endif()
 endif()