From 5ba28d417a11b301edd957e1926c364572154573 Mon Sep 17 00:00:00 2001
From: Julian Oes <julian@oes.ch>
Date: Fri, 6 Mar 2020 15:06:31 +0100
Subject: [PATCH] mavsdk_tests: try using tags as intended

The tags should enable use to assemble the tests in various ways. This
will probably require some iterations though.
---
 test/mavsdk_tests/configs/sitl.json             | 8 ++++----
 test/mavsdk_tests/test_multicopter_offboard.cpp | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/mavsdk_tests/configs/sitl.json b/test/mavsdk_tests/configs/sitl.json
index 3406c57d98..d9ee544dfd 100644
--- a/test/mavsdk_tests/configs/sitl.json
+++ b/test/mavsdk_tests/configs/sitl.json
@@ -6,23 +6,23 @@
     [
         {
             "model": "iris",
-            "test_filter": "[multicopter]",
+            "test_filter": "[multicopter],[offboard]",
             "timeout_min": 20
         },
         {
             "model": "iris_opt_flow_mockup",
-            "test_filter": "[multicopter_offboard]",
+            "test_filter": "[multicopter][offboard][nogps]",
             "timeout_min": 20
         },
         {
             "model": "iris_vision",
-            "test_filter": "[multicopter_offboard]",
+            "test_filter": "[multicopter][offboard][nogps]",
             "timeout_min": 20,
             "max_speed_factor": 1
         },
         {
             "model": "standard_vtol",
-            "test_filter": "[vtol]",
+            "test_filter": "[multicopter][vtol]",
             "timeout_min": 20
         }
     ]
diff --git a/test/mavsdk_tests/test_multicopter_offboard.cpp b/test/mavsdk_tests/test_multicopter_offboard.cpp
index 18430b2727..a366f8a9b6 100644
--- a/test/mavsdk_tests/test_multicopter_offboard.cpp
+++ b/test/mavsdk_tests/test_multicopter_offboard.cpp
@@ -11,7 +11,7 @@
 #include "autopilot_tester.h"
 
 
-TEST_CASE("Takeoff and Land (Multicopter offboard)", "[multicopter_offboard]")
+TEST_CASE("Takeoff and Land (Multicopter offboard)", "[multicopter][offboard][nogps]")
 {
     AutopilotTester tester;
     Offboard::PositionNEDYaw takeoff_position {0.0f, 0.0f, -2.0f, 0.0f};
@@ -25,7 +25,7 @@ TEST_CASE("Takeoff and Land (Multicopter offboard)", "[multicopter_offboard]")
     tester.check_home_within(0.5f);
 }
 
-TEST_CASE("Mission (Multicopter offboard )", "[multicopter_offboard]")
+TEST_CASE("Mission (Multicopter offboard )", "[multicopter][offboard][nogps]")
 {
     AutopilotTester tester;
     Offboard::PositionNEDYaw takeoff_position {0.0f, 0.0f, -2.0f, 0.0f};