CI: test: alphabetize args

abhishekvijeev · Jan 31, 2019 · 4821885 · 4821885
1 parent 0fafa9d
commit 4821885
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/test/mavros_posix_test_mission.test b/test/mavros_posix_test_mission.test
@@ -5,16 +5,16 @@
     <arg name="est" default="ekf2"/>
     <arg name="gui" default="false"/>
     <arg name="interactive" default="false"/>
+    <arg name="mission"/>  <!-- no default, required input -->
     <arg name="vehicle" default="iris"/>
-    <arg name="mission"/>
     <!-- MAVROS, PX4 SITL, Gazebo -->
     <include file="$(find px4)/launch/mavros_posix_sitl.launch">
         <arg name="est" value="$(arg est)"/>
         <arg name="gui" value="$(arg gui)"/>
         <arg name="interactive" value="$(arg interactive)"/>
-        <arg name="vehicle" value="$(arg vehicle)"/>
         <arg name="respawn_gazebo" value="true"/>
         <arg name="respawn_mavros" value="true"/>
+        <arg name="vehicle" value="$(arg vehicle)"/>
         <arg name="verbose" value="true"/>
     </include>
     <!-- ROStest -->

diff --git a/test/mavros_posix_tests_iris_opt_flow.test b/test/mavros_posix_tests_iris_opt_flow.test
@@ -10,9 +10,9 @@
         <arg name="est" value="$(arg est)"/>
         <arg name="gui" value="$(arg gui)"/>
         <arg name="interactive" value="$(arg interactive)"/>
-        <arg name="vehicle" value="iris_opt_flow"/>
         <arg name="respawn_gazebo" value="true"/>
         <arg name="respawn_mavros" value="true"/>
+        <arg name="vehicle" value="iris_opt_flow"/>
         <arg name="verbose" value="true"/>
     </include>
     <!-- ROStest -->

diff --git a/test/mavros_posix_tests_missions.test b/test/mavros_posix_tests_missions.test
@@ -4,16 +4,16 @@
     <!-- Test all missions -->
     <arg name="est" default="ekf2"/>
     <arg name="gui" default="false"/>
-    <arg name="vehicle" default="standard_vtol"/>
     <arg name="interactive" default="false"/>
+    <arg name="vehicle" default="standard_vtol"/>
     <!-- MAVROS, PX4 SITL, Gazebo -->
     <include file="$(find px4)/launch/mavros_posix_sitl.launch">
         <arg name="est" value="$(arg est)"/>
         <arg name="gui" value="$(arg gui)"/>
         <arg name="interactive" value="$(arg interactive)"/>
-        <arg name="vehicle" value="$(arg vehicle)"/>
         <arg name="respawn_gazebo" value="true"/>
         <arg name="respawn_mavros" value="true"/>
+        <arg name="vehicle" value="$(arg vehicle)"/>
         <arg name="verbose" value="true"/>
     </include>
     <!-- ROStest -->

diff --git a/test/mavros_posix_tests_offboard_attctl.test b/test/mavros_posix_tests_offboard_attctl.test
@@ -4,16 +4,16 @@
     <!-- Test offboard attitude control -->
     <arg name="est" default="ekf2"/>
     <arg name="gui" default="false"/>
-    <arg name="vehicle" default="iris"/>
     <arg name="interactive" default="false"/>
+    <arg name="vehicle" default="iris"/>
     <!-- MAVROS, PX4 SITL, Gazebo -->
     <include file="$(find px4)/launch/mavros_posix_sitl.launch">
         <arg name="est" value="$(arg est)"/>
         <arg name="gui" value="$(arg gui)"/>
         <arg name="interactive" value="$(arg interactive)"/>
-        <arg name="vehicle" value="$(arg vehicle)"/>
         <arg name="respawn_gazebo" value="true"/>
         <arg name="respawn_mavros" value="true"/>
+        <arg name="vehicle" value="$(arg vehicle)"/>
         <arg name="verbose" value="true"/>
     </include>
     <!-- ROStest -->

diff --git a/test/mavros_posix_tests_offboard_posctl.test b/test/mavros_posix_tests_offboard_posctl.test
@@ -4,16 +4,16 @@
     <!-- Test offboard local posistion control -->
     <arg name="est" default="ekf2"/>
     <arg name="gui" default="false"/>
-    <arg name="vehicle" default="iris"/>
     <arg name="interactive" default="false"/>
+    <arg name="vehicle" default="iris"/>
     <!-- MAVROS, PX4 SITL, Gazebo -->
     <include file="$(find px4)/launch/mavros_posix_sitl.launch">
         <arg name="est" value="$(arg est)"/>
         <arg name="gui" value="$(arg gui)"/>
         <arg name="interactive" value="$(arg interactive)"/>
-        <arg name="vehicle" value="$(arg vehicle)"/>
         <arg name="respawn_gazebo" value="true"/>
         <arg name="respawn_mavros" value="true"/>
+        <arg name="vehicle" value="$(arg vehicle)"/>
         <arg name="verbose" value="true"/>
     </include>
     <!-- ROStest -->