From 0ff64bf1011383831be507a8e9649b5b9c5a7044 Mon Sep 17 00:00:00 2001 From: Matthias Grob Date: Sun, 3 Mar 2019 17:55:59 +0100 Subject: [PATCH] Improve ctest unit test naming and filtering --- CMakeLists.txt | 2 +- cmake/gtest/px4_add_gtest.cmake | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5ddc25ed08..d1c65c2c09 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -424,7 +424,7 @@ include(px4_add_gtest) if(unit_testing) include(gtest) - add_custom_target(unit_test COMMAND GTEST_COLOR=1 ${CMAKE_CTEST_COMMAND} -V -R Test USES_TERMINAL) + add_custom_target(unit_test COMMAND GTEST_COLOR=1 ${CMAKE_CTEST_COMMAND} -V -R UnitTest- USES_TERMINAL) endif() #============================================================================= diff --git a/cmake/gtest/px4_add_gtest.cmake b/cmake/gtest/px4_add_gtest.cmake index 42124acac3..2d50f08977 100644 --- a/cmake/gtest/px4_add_gtest.cmake +++ b/cmake/gtest/px4_add_gtest.cmake @@ -50,8 +50,10 @@ function(px4_add_gtest) REQUIRED SRC ARGN ${ARGN}) - # infer test name from source filname without extension + # infer test name from source filname get_filename_component(TESTNAME ${SRC} NAME_WE) + string(REPLACE Test "" TESTNAME ${TESTNAME}) + set(TESTNAME UnitTest-${TESTNAME}) # build a binary for the unit test add_executable(${TESTNAME} EXCLUDE_FROM_ALL ${SRC})