From 482f2c94424f32e45aaee68b8b515e1eab40b6de Mon Sep 17 00:00:00 2001
From: Andreas Antener <antener_a@gmx.ch>
Date: Mon, 23 Feb 2015 23:45:54 +0100
Subject: added integration tests to cmake list

---
 CMakeLists.txt                           | 3 ++-
 integrationtests/integrationtests.launch | 4 ----
 2 files changed, 2 insertions(+), 5 deletions(-)
 delete mode 100644 integrationtests/integrationtests.launch

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca8e11488..457a0bfa7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -324,7 +324,8 @@ install(TARGETS ${PROJECT_NAME}
 
 if(CATKIN_ENABLE_TESTING)
   find_package(rostest REQUIRED)
-  add_rostest(integrationtests/integrationtests.launch)
+  add_rostest(integrationtests/demo_tests/direct_tests.launch)
+  add_rostest(integrationtests/demo_tests/mavros_tests.launch)
 endif()
 
 
diff --git a/integrationtests/integrationtests.launch b/integrationtests/integrationtests.launch
deleted file mode 100644
index 7f6368d12..000000000
--- a/integrationtests/integrationtests.launch
+++ /dev/null
@@ -1,4 +0,0 @@
-<launch>
-	<include file="$(find px4)/integrationtests/demo_tests/direct_tests.launch" />
-	<include file="$(find px4)/integrationtests/demo_tests/mavros_tests.launch" />
-</launch>
-- 
cgit v1.2.3