From 9472b4b1f72013f59e16fe5947a0fda8628d50c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beat=20K=C3=BCng?= Date: Tue, 17 Jun 2025 11:41:01 +0200 Subject: [PATCH] refactor: remove '#define MODULE_NAME' from tests And use target_compile_definitions() instead --- cmake/px4_add_gtest.cmake | 2 ++ src/modules/manual_control/ManualControlTest.cpp | 2 -- src/modules/rc_update/RCUpdateTest.cpp | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cmake/px4_add_gtest.cmake b/cmake/px4_add_gtest.cmake index f4cee17e99..7b4d1bc4c9 100644 --- a/cmake/px4_add_gtest.cmake +++ b/cmake/px4_add_gtest.cmake @@ -116,6 +116,8 @@ function(px4_add_functional_gtest) # also links to fuzztest_gtest_main test_stubs) # put test_stubs last + target_compile_definitions(${TESTNAME} PRIVATE MODULE_NAME="${TESTNAME}") + if(COMPILE_FLAGS) target_compile_options(${TESTNAME} PRIVATE ${COMPILE_FLAGS}) endif() diff --git a/src/modules/manual_control/ManualControlTest.cpp b/src/modules/manual_control/ManualControlTest.cpp index 20591b48dc..6646908e49 100644 --- a/src/modules/manual_control/ManualControlTest.cpp +++ b/src/modules/manual_control/ManualControlTest.cpp @@ -31,8 +31,6 @@ * ****************************************************************************/ -#define MODULE_NAME "manual_control" - #include #include "ManualControl.hpp" diff --git a/src/modules/rc_update/RCUpdateTest.cpp b/src/modules/rc_update/RCUpdateTest.cpp index b6defca603..6b1ade82cc 100644 --- a/src/modules/rc_update/RCUpdateTest.cpp +++ b/src/modules/rc_update/RCUpdateTest.cpp @@ -31,8 +31,6 @@ * ****************************************************************************/ -#define MODULE_NAME "rc_update" - #include #include "rc_update.h"