Merge f9b630d into 88aba23

mavlink · Mar 4, 2024 · dcfbf0c · dcfbf0c
2 parents 88aba23 + f9b630d
commit dcfbf0c
Show file tree

Hide file tree

Showing 45 changed files with 50 additions and 535 deletions.
diff --git a/docker/Dockerfile-Ubuntu-20.04 b/docker/Dockerfile-Ubuntu-20.04
diff --git a/docker/Dockerfile-Ubuntu-20.04-APM-SITL-Copter-4.1.2 b/docker/Dockerfile-Ubuntu-20.04-APM-SITL-Copter-4.1.2
diff --git a/docker/Dockerfile-Ubuntu-20.04-APM-SITL-Rover-4.1.2 b/docker/Dockerfile-Ubuntu-20.04-APM-SITL-Rover-4.1.2
diff --git a/docker/Dockerfile-Ubuntu-20.04-PX4-SITL-v1.11 b/docker/Dockerfile-Ubuntu-20.04-PX4-SITL-v1.11
diff --git a/docker/Dockerfile-Ubuntu-20.04-PX4-SITL-v1.12 b/docker/Dockerfile-Ubuntu-20.04-PX4-SITL-v1.12
diff --git a/docker/Dockerfile-Ubuntu-22.04-PX4-SITL-v1.13 b/docker/Dockerfile-Ubuntu-22.04-PX4-SITL-v1.13
diff --git a/docker/Dockerfile-Ubuntu-22.04 → docker/Dockerfile-dev b/docker/Dockerfile-Ubuntu-22.04 → docker/Dockerfile-dev
diff --git a/docker/Dockerfile.dockcross-linux-arm64-custom b/docker/Dockerfile.dockcross-linux-arm64-custom
@@ -1,4 +1,4 @@
-FROM dockcross/linux-arm64-lts
+FROM dockcross/linux-arm64
 
 ENV DEFAULT_DOCKCROSS_IMAGE mavsdk/mavsdk-dockcross-linux-arm64-custom
 

diff --git a/docker/Dockerfile.dockcross-linux-armv6-custom b/docker/Dockerfile.dockcross-linux-armv6-custom
@@ -1,4 +1,4 @@
-FROM dockcross/linux-armv6-lts
+FROM dockcross/linux-armv6
 
 ENV DEFAULT_DOCKCROSS_IMAGE mavsdk/mavsdk-dockcross-linux-armv6-custom
 

diff --git a/docker/Dockerfile.dockcross-linux-armv7-custom b/docker/Dockerfile.dockcross-linux-armv7-custom
@@ -1,4 +1,4 @@
-FROM dockcross/linux-armv7-lts
+FROM dockcross/linux-armv7
 
 ENV DEFAULT_DOCKCROSS_IMAGE mavsdk/mavsdk-dockcross-linux-armv7-custom
 

diff --git a/docker/build_and_push_docker_images.sh b/docker/build_and_push_docker_images.sh
@@ -10,24 +10,12 @@ then
     DOCKER_CMD=podman
 fi
 
-$DOCKER_CMD build -f Dockerfile-Ubuntu-20.04 -t mavsdk/mavsdk-ubuntu-20.04 .
-$DOCKER_CMD build -f Dockerfile-Ubuntu-22.04 -t mavsdk/mavsdk-ubuntu-22.04 .
-$DOCKER_CMD build -f Dockerfile-Ubuntu-20.04-PX4-SITL-v1.11 -t mavsdk/mavsdk-ubuntu-20.04-px4-sitl-v1.11 .
-$DOCKER_CMD build -f Dockerfile-Ubuntu-20.04-PX4-SITL-v1.12 -t mavsdk/mavsdk-ubuntu-20.04-px4-sitl-v1.12 .
-$DOCKER_CMD build -f Dockerfile-Ubuntu-22.04-PX4-SITL-v1.13 -t mavsdk/mavsdk-ubuntu-22.04-px4-sitl-v1.13 .
-$DOCKER_CMD build -f Dockerfile-Ubuntu-20.04-APM-SITL-Copter-4.1.2 -t mavsdk/mavsdk-ubuntu-20.04-apm-sitl-copter-4.1.2 .
-$DOCKER_CMD build -f Dockerfile-Ubuntu-20.04-APM-SITL-Rover-4.1.2 -t mavsdk/mavsdk-ubuntu-20.04-apm-sitl-rover-4.1.2 .
+$DOCKER_CMD build -f Dockerfile-dev -t mavsdk/mavsdk-dev .
 $DOCKER_CMD build -f Dockerfile.dockcross-linux-armv6-custom -t mavsdk/mavsdk-dockcross-linux-armv6-custom .
 $DOCKER_CMD build -f Dockerfile.dockcross-linux-armv7-custom -t mavsdk/mavsdk-dockcross-linux-armv7-custom .
 $DOCKER_CMD build -f Dockerfile.dockcross-linux-arm64-custom -t mavsdk/mavsdk-dockcross-linux-arm64-custom .
 
-$DOCKER_CMD push mavsdk/mavsdk-ubuntu-20.04:latest
-$DOCKER_CMD push mavsdk/mavsdk-ubuntu-22.04:latest
-$DOCKER_CMD push mavsdk/mavsdk-ubuntu-20.04-px4-sitl-v1.11:latest
-$DOCKER_CMD push mavsdk/mavsdk-ubuntu-20.04-px4-sitl-v1.12:latest
-$DOCKER_CMD push mavsdk/mavsdk-ubuntu-22.04-px4-sitl-v1.13:latest
-$DOCKER_CMD push mavsdk/mavsdk-ubuntu-20.04-apm-sitl-copter-4.1.2:latest
-$DOCKER_CMD push mavsdk/mavsdk-ubuntu-20.04-apm-sitl-rover-4.1.2:latest
+$DOCKER_CMD push mavsdk/mavsdk-dev:latest
 $DOCKER_CMD push mavsdk/mavsdk-dockcross-linux-armv6-custom:latest
 $DOCKER_CMD push mavsdk/mavsdk-dockcross-linux-armv7-custom:latest
 $DOCKER_CMD push mavsdk/mavsdk-dockcross-linux-arm64-custom:latest
diff --git a/src/integration_tests/CMakeLists.txt b/src/integration_tests/CMakeLists.txt
@@ -98,16 +98,3 @@ target_link_libraries(integration_tests_runner
 add_test(integration_tests
     integration_tests_runner
 )
-
-add_custom_command(TARGET integration_tests_runner
-    POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different
-        ${CMAKE_CURRENT_SOURCE_DIR}/../../tools/start_sitl.sh
-        ${CMAKE_CURRENT_BINARY_DIR}
-)
-add_custom_command(TARGET integration_tests_runner
-    POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different
-        ${CMAKE_CURRENT_SOURCE_DIR}/../../tools/stop_sitl.sh
-        ${CMAKE_CURRENT_BINARY_DIR}
-)
diff --git a/src/integration_tests/action_goto.cpp b/src/integration_tests/action_goto.cpp
@@ -7,7 +7,7 @@
 
 using namespace mavsdk;
 
-TEST_F(SitlTest, PX4ActionGoto)
+TEST(SitlTest, PX4ActionGoto)
 {
     Mavsdk mavsdk{Mavsdk::Configuration{Mavsdk::ComponentType::GroundStation}};
 

diff --git a/src/integration_tests/action_hold.cpp b/src/integration_tests/action_hold.cpp
@@ -7,7 +7,7 @@
 
 using namespace mavsdk;
 
-TEST_F(SitlTest, PX4ActionHold)
+TEST(SitlTest, PX4ActionHold)
 {
     Mavsdk mavsdk{Mavsdk::Configuration{Mavsdk::ComponentType::GroundStation}};
 

diff --git a/src/integration_tests/action_hover_async.cpp b/src/integration_tests/action_hover_async.cpp
@@ -7,7 +7,7 @@
 
 using namespace mavsdk;
 
-TEST_F(SitlTest, ActionHoverAsync)
+TEST(SitlTest, ActionHoverAsync)
 {
     Mavsdk mavsdk{Mavsdk::Configuration{Mavsdk::ComponentType::GroundStation}};
 

diff --git a/src/integration_tests/action_hover_sync.cpp b/src/integration_tests/action_hover_sync.cpp
@@ -10,34 +10,34 @@ using namespace mavsdk;
 static void takeoff_and_hover_at_altitude(float altitude_m);
 void takeoff_and_hover_at_altitude_apm(float altitude_m);
 
-TEST_F(SitlTest, PX4ActionHoverSyncDefault)
+TEST(SitlTest, PX4ActionHoverSyncDefault)
 {
     takeoff_and_hover_at_altitude(2.5);
 }
 
-TEST_F(SitlTest, PX4ActionHoverSyncHigher)
+TEST(SitlTest, PX4ActionHoverSyncHigher)
 {
     takeoff_and_hover_at_altitude(5.0f);
 }
 
-TEST_F(SitlTest, PX4ActionHoverSyncLower)
+TEST(SitlTest, PX4ActionHoverSyncLower)
 {
     // TODO: less than 1.0 is currently failing due to a Firmware bug.
     // https://github.com/PX4/Firmware/issues/12471
     takeoff_and_hover_at_altitude(1.5f);
 }
 
-TEST_F(SitlTest, APMActionHoverSyncDefault)
+TEST(SitlTest, APMActionHoverSyncDefault)
 {
     takeoff_and_hover_at_altitude_apm(2.5);
 }
 
-TEST_F(SitlTest, APMActionHoverSyncHigher)
+TEST(SitlTest, APMActionHoverSyncHigher)
 {
     takeoff_and_hover_at_altitude_apm(5.0f);
 }
 
-TEST_F(SitlTest, APMActionHoverSyncLower)
+TEST(SitlTest, APMActionHoverSyncLower)
 {
     // TODO: less than 1.0 is currently failing due to a Firmware bug.
     // https://github.com/PX4/Firmware/issues/12471

diff --git a/src/integration_tests/action_takeoff_and_kill.cpp b/src/integration_tests/action_takeoff_and_kill.cpp
@@ -1,12 +1,13 @@
 #include <iostream>
+#include <future>
 #include "integration_test_helper.h"
 #include "mavsdk.h"
 #include "plugins/action/action.h"
 #include "plugins/telemetry/telemetry.h"
 
 using namespace mavsdk;
 
-TEST_F(SitlTest, ActionTakeoffAndKill)
+TEST(SitlTest, ActionTakeoffAndKill)
 {
     Mavsdk mavsdk{Mavsdk::Configuration{Mavsdk::ComponentType::GroundStation}};
     ASSERT_EQ(mavsdk.add_udp_connection(), ConnectionResult::Success);

diff --git a/src/integration_tests/action_transition_multicopter_fixedwing.cpp b/src/integration_tests/action_transition_multicopter_fixedwing.cpp
@@ -7,7 +7,7 @@
 
 using namespace mavsdk;
 
-TEST_F(SitlTest, PX4ActionTransitionSync_standard_vtol)
+TEST(SitlTest, PX4ActionTransitionSync_standard_vtol)
 {
     // Init & connect
     Mavsdk mavsdk{Mavsdk::Configuration{Mavsdk::ComponentType::GroundStation}};

diff --git a/src/integration_tests/follow_me.cpp b/src/integration_tests/follow_me.cpp
@@ -29,7 +29,7 @@ void send_location_updates(
 const size_t N_LOCATIONS = 100ul;
 
 /* Test FollowMe with a stationary target at one location */
-TEST_F(SitlTest, PX4FollowMeOneLocation)
+TEST(SitlTest, PX4FollowMeOneLocation)
 {
     Mavsdk mavsdk{Mavsdk::Configuration{Mavsdk::ComponentType::GroundStation}};
 
@@ -112,7 +112,7 @@ TEST_F(SitlTest, PX4FollowMeOneLocation)
 }
 
 /* Test FollowMe with a dynamically moving target */
-TEST_F(SitlTest, PX4FollowMeMultiLocationWithConfig)
+TEST(SitlTest, PX4FollowMeMultiLocationWithConfig)
 {
     Mavsdk mavsdk{Mavsdk::Configuration{Mavsdk::ComponentType::GroundStation}};