aboutsummaryrefslogtreecommitdiff
path: root/integrationtests/demo_tests/mavros_tests.launch
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2015-03-07 19:27:36 +0100
committerThomas Gubler <thomasgubler@gmail.com>2015-03-10 20:56:53 +0100
commit9a9ca184e80622f2e217b4397be78a74cb1dad7f (patch)
treea1ea9f707a2c6b2e9fa0db64884aea45d75f4bbb /integrationtests/demo_tests/mavros_tests.launch
parentdf4f8259026bb7882659303558f5fb5b0d99e5f6 (diff)
downloadpx4-firmware-9a9ca184e80622f2e217b4397be78a74cb1dad7f.tar.gz
px4-firmware-9a9ca184e80622f2e217b4397be78a74cb1dad7f.tar.bz2
px4-firmware-9a9ca184e80622f2e217b4397be78a74cb1dad7f.zip
update namespace in mavros tests
Diffstat (limited to 'integrationtests/demo_tests/mavros_tests.launch')
-rw-r--r--integrationtests/demo_tests/mavros_tests.launch8
1 files changed, 6 insertions, 2 deletions
diff --git a/integrationtests/demo_tests/mavros_tests.launch b/integrationtests/demo_tests/mavros_tests.launch
index 4651f0dc9..e42db6043 100644
--- a/integrationtests/demo_tests/mavros_tests.launch
+++ b/integrationtests/demo_tests/mavros_tests.launch
@@ -3,7 +3,8 @@
<arg name="gui" default="false"/>
<arg name="enable_logging" default="false"/>
<arg name="enable_ground_truth" default="false"/>
- <arg name="log_file" default="iris"/>
+ <arg name="ns" default="iris"/>
+ <arg name="log_file" default="$(arg ns)"/>
<include file="$(find px4)/launch/gazebo_iris_empty_world.launch">
<arg name="headless" value="$(arg headless)"/>
@@ -11,8 +12,11 @@
<arg name="enable_logging" value="$(arg enable_logging)" />
<arg name="enable_ground_truth" value="$(arg enable_ground_truth)" />
<arg name="log_file" value="$(arg log_file)"/>
+ <arg name="ns" value="$(arg ns)"/>
+ </include>
+ <include file="$(find px4)/launch/mavros_sitl.launch">
+ <arg name="ns" value="$(arg ns)"/>
</include>
- <include file="$(find px4)/launch/mavros_sitl.launch" />
<test test-name="mavros_offboard_posctl_test" pkg="px4" type="mavros_offboard_posctl_test.py" />
<test test-name="mavros_offboard_attctl_test" pkg="px4" type="mavros_offboard_attctl_test.py" />