diff options
author | Andreas Antener <antener_a@gmx.ch> | 2015-02-23 18:33:10 +0100 |
---|---|---|
committer | Thomas Gubler <thomasgubler@gmail.com> | 2015-02-28 18:25:36 +0100 |
commit | 85ac3e3515bc214a770074182617208b24ee0209 (patch) | |
tree | 5e91c5fe66ee9e5f9d87d0e4a957b74f4fdcd3a5 | |
parent | 75f1678047e2beb4ec4e1cf7fd383685175d3694 (diff) | |
download | px4-firmware-85ac3e3515bc214a770074182617208b24ee0209.tar.gz px4-firmware-85ac3e3515bc214a770074182617208b24ee0209.tar.bz2 px4-firmware-85ac3e3515bc214a770074182617208b24ee0209.zip |
renamed tests, added placeholder for mavros test
-rw-r--r-- | integrationtests/demo_tests/demo_tests.launch | 19 | ||||
-rwxr-xr-x | integrationtests/demo_tests/direct_arm_test.py (renamed from integrationtests/demo_tests/arm_test.py) | 0 | ||||
-rwxr-xr-x | integrationtests/demo_tests/direct_offboard_posctl_test.py (renamed from integrationtests/demo_tests/offboard_posctl_test.py) | 0 | ||||
-rw-r--r-- | integrationtests/demo_tests/direct_tests.launch | 18 | ||||
-rw-r--r-- | integrationtests/demo_tests/mavros_tests.launch | 18 | ||||
-rw-r--r-- | integrationtests/integrationtests.launch | 15 |
6 files changed, 38 insertions, 32 deletions
diff --git a/integrationtests/demo_tests/demo_tests.launch b/integrationtests/demo_tests/demo_tests.launch deleted file mode 100644 index 34281b781..000000000 --- a/integrationtests/demo_tests/demo_tests.launch +++ /dev/null @@ -1,19 +0,0 @@ -<launch> - <arg name="headless" default="false"/> - <arg name="gui" default="true"/> - <arg name="enable_logging" default="false"/> - <arg name="enable_ground_truth" default="false"/> - <arg name="log_file" default="iris"/> - - <include file="$(find px4)/launch/gazebo_iris_empty_world.launch"> - <arg name="headless" value="$(arg headless)"/> - <arg name="gui" value="$(arg gui)"/> - <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)"/> - </include> - <include file="$(find px4)/launch/mavros_sitl.launch" /> - - <test test-name="arm" pkg="px4" type="arm_test.py" /> - <test test-name="offboard_posctl" pkg="px4" type="offboard_posctl_test.py" /> -</launch> diff --git a/integrationtests/demo_tests/arm_test.py b/integrationtests/demo_tests/direct_arm_test.py index 569e0af7c..569e0af7c 100755 --- a/integrationtests/demo_tests/arm_test.py +++ b/integrationtests/demo_tests/direct_arm_test.py diff --git a/integrationtests/demo_tests/offboard_posctl_test.py b/integrationtests/demo_tests/direct_offboard_posctl_test.py index af8d4b821..af8d4b821 100755 --- a/integrationtests/demo_tests/offboard_posctl_test.py +++ b/integrationtests/demo_tests/direct_offboard_posctl_test.py diff --git a/integrationtests/demo_tests/direct_tests.launch b/integrationtests/demo_tests/direct_tests.launch new file mode 100644 index 000000000..d871c085c --- /dev/null +++ b/integrationtests/demo_tests/direct_tests.launch @@ -0,0 +1,18 @@ +<launch> + <arg name="headless" default="true"/> + <arg name="gui" default="false"/> + <arg name="enable_logging" default="false"/> + <arg name="enable_ground_truth" default="false"/> + <arg name="log_file" default="iris"/> + + <include file="$(find px4)/launch/gazebo_iris_empty_world.launch"> + <arg name="headless" value="$(arg headless)"/> + <arg name="gui" value="$(arg gui)"/> + <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)"/> + </include> + + <test test-name="direct_arm" pkg="px4" type="direct_arm_test.py" /> + <test test-name="direct_offboard_posctl" pkg="px4" type="direct_offboard_posctl_test.py" /> +</launch> diff --git a/integrationtests/demo_tests/mavros_tests.launch b/integrationtests/demo_tests/mavros_tests.launch new file mode 100644 index 000000000..f5ad3412d --- /dev/null +++ b/integrationtests/demo_tests/mavros_tests.launch @@ -0,0 +1,18 @@ +<launch> + <arg name="headless" default="true"/> + <arg name="gui" default="false"/> + <arg name="enable_logging" default="false"/> + <arg name="enable_ground_truth" default="false"/> + <arg name="log_file" default="iris"/> + + <include file="$(find px4)/launch/gazebo_iris_empty_world.launch"> + <arg name="headless" value="$(arg headless)"/> + <arg name="gui" value="$(arg gui)"/> + <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)"/> + </include> + <include file="$(find px4)/launch/mavros_sitl.launch" /> + + <test test-name="direct_arm" pkg="px4" type="mavros_offboard_posctl_test.py" /> +</launch> diff --git a/integrationtests/integrationtests.launch b/integrationtests/integrationtests.launch index 2e59b5615..7f6368d12 100644 --- a/integrationtests/integrationtests.launch +++ b/integrationtests/integrationtests.launch @@ -1,15 +1,4 @@ <launch> - <arg name="headless" default="true"/> - <arg name="gui" default="false"/> - <arg name="enable_logging" default="false"/> - <arg name="enable_ground_truth" default="false"/> - <arg name="log_file" default="iris"/> - - <include file="$(find px4)/integrationtests/demo_tests/demo_tests.launch"> - <arg name="headless" value="$(arg headless)"/> - <arg name="gui" value="$(arg gui)"/> - <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)"/> - </include> + <include file="$(find px4)/integrationtests/demo_tests/direct_tests.launch" /> + <include file="$(find px4)/integrationtests/demo_tests/mavros_tests.launch" /> </launch> |