gtest cmake: fix unit test filter

somebody-once-told-me · Nov 20, 2024 · 1aadbf8 · 1aadbf8
1 parent 129c0f1
commit 1aadbf8
Showing 1 changed file with 5 additions and 4 deletions.
diff --git 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