build to install space directly (ros-industrial#54)

mathias-luedtke · Mar 9, 2017 · 392ebf2 · 392ebf2
1 parent 665f172
commit 392ebf2
Showing 1 changed file with 3 additions and 13 deletions.
diff --git a/industrial_ci/src/tests/source_tests.sh b/industrial_ci/src/tests/source_tests.sh
@@ -101,6 +101,7 @@ if [ "${USE_MOCKUP// }" != "" ]; then
     ln -s "$TARGET_REPO_PATH/$USE_MOCKUP" $CATKIN_WORKSPACE/src
 fi
 
+catkin config --install
 
 ici_time_end  # setup_workspace
 
@@ -148,17 +149,6 @@ fi
 
 if [ "$NOT_TEST_INSTALL" != "true" ]; then
 
-    ici_time_start catkin_install_build
-
-    # Test if the packages in the downstream repo build.
-    if [ "$BUILDER" == catkin ]; then
-        catkin clean --yes || catkin clean -b
-        catkin config --install
-        catkin build $OPT_VI --summarize --no-status $BUILD_PKGS_WHITELIST $CATKIN_PARALLEL_JOBS --make-args $ROS_PARALLEL_JOBS
-        source $CATKIN_WORKSPACE/install/setup.bash
-    fi
-
-    ici_time_end  # catkin_install_build
     ici_time_start catkin_install_run_tests
 
     export EXIT_STATUS=0
@@ -170,10 +160,10 @@ if [ "$NOT_TEST_INSTALL" != "true" ]; then
         echo "[$pkg] Found $(echo $rostest_files | wc -w) tests."
         for test_file in $rostest_files; do
           echo "[$pkg] Testing $test_file"
-          rostest $test_file || export EXIT_STATUS=$?
+          $CATKIN_WORKSPACE/install/env.sh rostest $test_file || export EXIT_STATUS=$?
           if [ $? != 0 ]; then
             echo -e "[$pkg] Testing again the failed test: $test_file.\e[31m>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\e[0m"
-            rostest --text $test_file
+            $CATKIN_WORKSPACE/install/env.sh rostest --text $test_file
             echo -e "[$pkg] Testing again the failed test: $test_file.\e[31m<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\e[0m"
           fi
         done