Fix the --gtest_filter option for omrporttest

When ${porttest_filter} is an empty string, no tests from omrporttest are run. Also, --gtest_filter input does not need to be wrapped in quotation marks. The below changes will correctly run omrporttest with an empty filter string: --gtest_filter=*${porttest_filter}* --gtest_filter=*Cuda* Fixes: eclipse#6486 Signed-off-by: Babneet Singh <[email protected]>
babsingh · Apr 20, 2022 · 66d951f · 66d951f
1 parent 7abfd05
commit 66d951f
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/fvtest/porttest/CMakeLists.txt b/fvtest/porttest/CMakeLists.txt
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2017, 2021 IBM Corp. and others
+# Copyright (c) 2017, 2022 IBM Corp. and others
 #
 # This program and the accompanying materials are made available under
 # the terms of the Eclipse Public License 2.0 which accompanies this
@@ -165,13 +165,13 @@ endif()
 if (NOT (OMR_OS_AIX OR OMR_OS_ZOS OR CMAKE_CROSSCOMPILING))
 	omr_add_test(
 		NAME porttest
-		COMMAND $<TARGET_FILE:omrporttest> --gtest_output=xml:${CMAKE_CURRENT_BINARY_DIR}/omrporttest-results.xml --gtest_filter=${porttest_filter}
+		COMMAND $<TARGET_FILE:omrporttest> --gtest_output=xml:${CMAKE_CURRENT_BINARY_DIR}/omrporttest-results.xml --gtest_filter=*${porttest_filter}*
 	)
 endif()
 
 if(OMR_OPT_CUDA)
 	omr_add_test(
 		NAME cuda_porttest
-		COMMAND $<TARGET_FILE:omrporttest> --gtest_output=xml:${CMAKE_CURRENT_BINARY_DIR}/omrporttest-results.xml --gtest_filter="Cuda*" -earlyExit
+		COMMAND $<TARGET_FILE:omrporttest> --gtest_output=xml:${CMAKE_CURRENT_BINARY_DIR}/omrporttest-results.xml --gtest_filter=*Cuda* -earlyExit
 	)
 endif()