diff options
| author | Andreas Antener <antener_a@gmx.ch> | 2015-02-23 23:45:54 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2015-02-28 18:25:36 +0100 |
| commit | 482f2c94424f32e45aaee68b8b515e1eab40b6de (patch) | |
| tree | 0e32c46554f76f73132568bfe5897b4bdfa32de6 | |
| parent | b955b9391d611706d1fd022c527426cab6a54924 (diff) | |
| download | px4-firmware-ros_mavlink.tar.gz px4-firmware-ros_mavlink.tar.bz2 px4-firmware-ros_mavlink.zip | |
added integration tests to cmake listros_mavlink
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | integrationtests/integrationtests.launch | 4 |
2 files changed, 2 insertions, 5 deletions
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> |