diff --git a/.gitignore b/.gitignore index 005319ed..cfbad01c 100644 --- a/.gitignore +++ b/.gitignore @@ -108,3 +108,6 @@ ENV/ .catkin_workspace devel/ build/ + +# vscode +.txt.user diff --git a/core/cmake/common/gtest.cmake b/core/cmake/common/gtest.cmake index d814ca63..0a7e319c 100644 --- a/core/cmake/common/gtest.cmake +++ b/core/cmake/common/gtest.cmake @@ -77,7 +77,7 @@ macro(add_gtest) endif() foreach(GTEST_SOURCE_FILE ${GTEST_SOURCES}) - file(STRINGS ${GTEST_SOURCE_FILE} GTEST_TEST_NAMES REGEX "^TEST") + file(STRINGS ${GTEST_SOURCE_FILE} GTEST_TEST_NAMES REGEX "^TEST_F|^TEST") foreach(GTEST_TEST_NAME ${GTEST_TEST_NAMES}) string(REGEX REPLACE ["\) \(,"] ";" GTEST_TEST_NAME ${GTEST_TEST_NAME}) list(GET GTEST_TEST_NAME 1 GTEST_GROUP_NAME) @@ -85,6 +85,7 @@ macro(add_gtest) add_test(NAME ${GTEST_GROUP_NAME}.${GTEST_TEST_NAME} COMMAND ${command} --gtest_filter=${GTEST_GROUP_NAME}.${GTEST_TEST_NAME}:*/${GTEST_GROUP_NAME}.${GTEST_TEST_NAME}/*) + # Add environment set(GTEST_ENVIRONMENT "") if(WIN32)