From 1aadbf85af026ef53ecfe10a5432437c0383f2aa Mon Sep 17 00:00:00 2001
From: Matthias Grob <maetugr@gmail.com>
Date: Tue, 19 Nov 2024 20:32:40 +0100
Subject: [PATCH] gtest cmake: fix unit test filter

---
 CMakeLists.txt | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 01dac0c061..55362b1425 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -408,14 +408,15 @@ include(px4_add_gtest)
 if(BUILD_TESTING)
 	include(gtest)
 
-	set(TESTFILTERARG "")
-
+	# Ensure there's no -R without any filter expression since that trips newer ctest versions
 	if(TESTFILTER)
-		set(TESTFILTERARG "-R ${TESTFILTER}")
+		set(TESTFILTERARG "-R")
+	else()
+		set(TESTFILTERARG "")
 	endif()
 
 	add_custom_target(test_results
-			COMMAND GTEST_COLOR=1 ${CMAKE_CTEST_COMMAND} --output-on-failure -T Test ${TESTFILTERARG}
+			COMMAND GTEST_COLOR=1 ${CMAKE_CTEST_COMMAND} --output-on-failure -T Test ${TESTFILTERARG} ${TESTFILTER}
 			DEPENDS
 				px4
 				examples__dyn_hello