tests: adding catkin package to test_ctest_merged

catkin · May 5, 2016 · 9c8b3be · 9c8b3be
1 parent a491706
commit 9c8b3be
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/tests/system/verbs/catkin_build/test_unit_tests.py b/tests/system/verbs/catkin_build/test_unit_tests.py
@@ -53,13 +53,17 @@ def test_ctest_merged():
     """Test ctest-based tests with a merged develspace"""
     cwd = os.getcwd()
     source_space = os.path.join(cwd, 'src')
-    shutil.copytree(os.path.join(RESOURCES_DIR, 'cmake_pkgs'), source_space)
+    shutil.copytree(os.path.join(RESOURCES_DIR, 'cmake_pkgs'),
+                    os.path.join(source_space, 'cmake_pkgs'))
+    shutil.copytree(os.path.join(RESOURCES_DIR, 'catkin_pkgs', 'make_warning'),
+                    os.path.join(source_space, 'make_warning'))
 
     with redirected_stdio() as (out, err):
         assert catkin_success(
             ['config', '--merge-devel', '--init'])
         assert catkin_success(
-            ['build', '--no-notify', '--no-status', '--verbose', 'test_pkg'])
+            ['build', '--no-notify', '--no-status', '--verbose',
+             'make_warning', 'test_pkg'])
         assert catkin_success(
             ['build', '--no-notify', '--no-status', '--verbose', '--no-deps',
              'test_pkg', '--make-args', 'test', 'ARGS="-V"'])