CMake: allow tests to be run using simulator

This commit add support for running (cross-compiled) tests on host using emulator, specified by `OMR_TEST_LAUNCHER` CMake variable. To make this work, this commit introduces new function - `omr_add_test()` that behaves just like CMake's `add_test()` but runs the command under simulator if needed. Signed-off-by: Jan Vrany <jan.vrany@fit.cvut.cz>
eclipse · Feb 1, 2021 · 68f2034 · 68f2034
1 parent 6ebbfd4
commit 68f2034
Show file tree

Hide file tree

Showing 22 changed files with 76 additions and 28 deletions.
diff --git a/buildenv/jenkins/omrbuild.groovy b/buildenv/jenkins/omrbuild.groovy
@@ -179,6 +179,8 @@ def SPECS = [
             ]
         ],
         'test' : false
+        'testArgs' : '',
+        'junitPublish' : true
     ],
     'linux_x86' : [
         'label' : 'Linux && x86',

diff --git a/cmake/modules/OmrTest.cmake b/cmake/modules/OmrTest.cmake
@@ -0,0 +1,43 @@
+###############################################################################
+# Copyright (c) 2021, 2021 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
+# distribution and is available at http://eclipse.org/legal/epl-2.0
+# or the Apache License, Version 2.0 which accompanies this distribution
+# and is available at https://www.apache.org/licenses/LICENSE-2.0.
+#
+# This Source Code may also be made available under the following Secondary
+# Licenses when the conditions for such availability set forth in the
+# Eclipse Public License, v. 2.0 are satisfied: GNU General Public License,
+# version 2 with the GNU Classpath Exception [1] and GNU General Public
+# License, version 2 with the OpenJDK Assembly Exception [2].
+#
+# [1] https://www.gnu.org/software/classpath/license.html
+# [2] http://openjdk.java.net/legal/assembly-exception.html
+#
+# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
+###############################################################################
+
+if(OMR_TEST_)
+	return()
+endif()
+set(OMR_TEST_ 1)
+
+if(NOT OMR_TEST_LAUNCHER)
+	if(OMR_EXE_LAUNCHER)
+		set(OMR_TEST_LAUNCHER "${OMR_EXE_LAUNCHER}")
+	endif()
+endif()
+
+function(omr_add_test)
+	cmake_parse_arguments(opt "" "NAME;COMMAND" "" ${ARGN})
+	if(NOT opt_COMMAND)
+		message(FATAL_ERROR "omr_add_test used without specifying COMMAND")
+	endif()
+	if(NOT opt_NAME)
+		message(FATAL_ERROR "omr_add_test used without specifying NAME")
+	endif()
+
+	add_test(NAME "${opt_NAME}" COMMAND ${OMR_TEST_LAUNCHER} ${opt_COMMAND} ${opt_UNPARSED_ARGUMENTS})
+endfunction()
diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
@@ -20,6 +20,7 @@
 ###############################################################################
 
 include(OmrAssert)
+include(OmrTest)
 
 omr_assert(TEST OMR_EXAMPLE)
 
@@ -50,7 +51,7 @@ if(OMR_GC)
 		${OMR_PORT_LIB}
 	)
 
-	add_test(NAME gcexample COMMAND $<TARGET_FILE:gcexample>)
+	omr_add_test(NAME gcexample COMMAND $<TARGET_FILE:gcexample>)
 endif(OMR_GC)
 
 add_subdirectory(glue)
diff --git a/fvtest/CMakeLists.txt b/fvtest/CMakeLists.txt
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2017, 2020 IBM Corp. and others
+# Copyright (c) 2017, 2021 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
@@ -20,6 +20,7 @@
 ###############################################################################
 
 include(OmrAssert)
+include(OmrTest)
 
 omr_assert(TEST OMR_FVTEST)
 

diff --git a/fvtest/algotest/CMakeLists.txt b/fvtest/algotest/CMakeLists.txt
@@ -64,4 +64,4 @@ endif()
 
 set_property(TARGET omralgotest PROPERTY FOLDER fvtest)
 
-add_test(NAME algotest COMMAND $<TARGET_FILE:omralgotest> --gtest_output=xml:${CMAKE_CURRENT_BINARY_DIR}/omralgotest-results.xml -avltest:${CMAKE_CURRENT_SOURCE_DIR}/avltest.lst)
+omr_add_test(NAME algotest COMMAND $<TARGET_FILE:omralgotest> --gtest_output=xml:${CMAKE_CURRENT_BINARY_DIR}/omralgotest-results.xml -avltest:${CMAKE_CURRENT_SOURCE_DIR}/avltest.lst)
diff --git a/fvtest/compilertest/CMakeLists.txt b/fvtest/compilertest/CMakeLists.txt
@@ -124,5 +124,5 @@ target_link_libraries(compilertest
 set_property(TARGET compilertest PROPERTY FOLDER fvtest)
 
 if (NOT OMR_HOST_OS STREQUAL "aix")
-	add_test(NAME CompilerTest COMMAND $<TARGET_FILE:compilertest> --gtest_output=xml:${CMAKE_CURRENT_BINARY_DIR}/compilertest-results.xml)
+	omr_add_test(NAME CompilerTest COMMAND $<TARGET_FILE:compilertest> --gtest_output=xml:${CMAKE_CURRENT_BINARY_DIR}/compilertest-results.xml)
 endif()
diff --git a/fvtest/compilertriltest/CMakeLists.txt b/fvtest/compilertriltest/CMakeLists.txt
@@ -70,7 +70,7 @@ endif()
 
 set_property(TARGET comptest PROPERTY FOLDER fvtest)
 
-add_test(
+omr_add_test(
 	NAME comptest
 	COMMAND $<TARGET_FILE:comptest> --gtest_color=yes --gtest_output=xml:${CMAKE_CURRENT_BINARY_DIR}/comptest-results.xml
 )
diff --git a/fvtest/compilerunittest/CMakeLists.txt b/fvtest/compilerunittest/CMakeLists.txt
@@ -64,7 +64,7 @@ target_link_libraries(compunittest
 
 set_property(TARGET compunittest PROPERTY FOLDER fvtest)
 
-add_test(
+omr_add_test(
 	NAME compunittest
 	COMMAND $<TARGET_FILE:compunittest> --gtest_color=yes --gtest_output=xml:${CMAKE_CURRENT_BINARY_DIR}/compunittest-results.xml
 )
diff --git a/fvtest/coretest/CMakeLists.txt b/fvtest/coretest/CMakeLists.txt
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2018, 2020 IBM Corp. and others
+# Copyright (c) 2018, 2021 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
@@ -31,7 +31,7 @@ function(omr_add_core_test testname)
 			omrvmstartup
 			omrGtestGlue
 	)
-	add_test(
+	omr_add_test(
 		NAME    "${testname}"
 		COMMAND "${testname}" --gtest_output=xml:${CMAKE_CURRENT_BINARY_DIR}/${testname}-results.xml
 	)

diff --git a/fvtest/gc_api_test/CMakeLists.txt b/fvtest/gc_api_test/CMakeLists.txt
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2018, 2020 IBM Corp. and others
+# Copyright (c) 2018, 2021 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
@@ -34,7 +34,7 @@ function(omr_add_gc_test testname)
 			omrgc
 			omrGtestGlue
 	)
-	add_test(
+	omr_add_test(
 		NAME    "${testname}"
 		COMMAND "$<TARGET_FILE:${testname}>" "--gtest_output=xml:${CMAKE_CURRENT_BINARY_DIR}/${testname}-results.xml"
 	)

diff --git a/fvtest/gctest/CMakeLists.txt b/fvtest/gctest/CMakeLists.txt
@@ -73,7 +73,7 @@ endif()
 
 set_property(TARGET omrgctest PROPERTY FOLDER fvtest)
 
-add_test(NAME gctest
+omr_add_test(NAME gctest
 	COMMAND $<TARGET_FILE:omrgctest> "--gtest_filter=gcFunctionalTest*" "--gtest_output=xml:${CMAKE_CURRENT_BINARY_DIR}/omrgctest-results.xml"
 	WORKING_DIRECTORY "${omr_SOURCE_DIR}"
 )
diff --git a/fvtest/jitbuildertest/CMakeLists.txt b/fvtest/jitbuildertest/CMakeLists.txt
@@ -60,5 +60,5 @@ set_property(TARGET jitbuildertest PROPERTY FOLDER fvtest)
 # Disable JitBuilder tests on RISC-V. This is essentially a workaround
 # until #4764 is addressed. Once done, tests should be properly skipped.
 if(NOT OMR_HOST_ARCH STREQUAL "riscv")
-	add_test(NAME JitBuilderTest COMMAND $<TARGET_FILE:jitbuildertest> --gtest_output=xml:${CMAKE_CURRENT_BINARY_DIR}/jitbuildertest-results.xml)
+	omr_add_test(NAME JitBuilderTest COMMAND $<TARGET_FILE:jitbuildertest> --gtest_output=xml:${CMAKE_CURRENT_BINARY_DIR}/jitbuildertest-results.xml)
 endif()
diff --git a/fvtest/lljbtest/CMakeLists.txt b/fvtest/lljbtest/CMakeLists.txt
@@ -59,7 +59,7 @@ target_link_libraries(lljb_run
 
 function(add_lljb_test test)
 	generate_module_from_cxx(${test})
-	add_test(
+	omr_add_test(
 		NAME lljb_${test}_test
 		COMMAND $<TARGET_FILE:lljb>_run ${test}.ll
 	)

diff --git a/fvtest/porttest/CMakeLists.txt b/fvtest/porttest/CMakeLists.txt
@@ -137,14 +137,14 @@ if(OMR_HOST_OS STREQUAL "aix")
 endif()
 
 if (NOT OMR_HOST_OS STREQUAL "aix" AND NOT OMR_HOST_OS STREQUAL "zos")
-	add_test(
+	omr_add_test(
 		NAME porttest
 		COMMAND $<TARGET_FILE:omrporttest> --gtest_output=xml:${CMAKE_CURRENT_BINARY_DIR}/omrporttest-results.xml
 	)
 endif()
 
 if(OMR_OPT_CUDA)
-	add_test(
+	omr_add_test(
 		NAME cuda_porttest
 		COMMAND $<TARGET_FILE:omrporttest> --gtest_output=xml:${CMAKE_CURRENT_BINARY_DIR}/omrporttest-results.xml --gtest_filter="Cuda*" -earlyExit
 	)

diff --git a/fvtest/rastest/CMakeLists.txt b/fvtest/rastest/CMakeLists.txt
@@ -244,9 +244,9 @@ add_dependencies(omrtraceoptiontest
 	traceOptionAgent
 )
 
-add_test(NAME rastest COMMAND $<TARGET_FILE:omrrastest> --gtest_output=xml:${CMAKE_CURRENT_BINARY_DIR}/omrrastest-results.xml)
-add_test(NAME subscribertest COMMAND $<TARGET_FILE:omrsubscribertest> --gtest_output=xml:${CMAKE_CURRENT_BINARY_DIR}/omrsubscribertest-results.xml)
-add_test(NAME traceoptiontest COMMAND $<TARGET_FILE:omrtraceoptiontest> --gtest_output=xml:${CMAKE_CURRENT_BINARY_DIR}/omrtraceoptiontest-results.xml)
+omr_add_test(NAME rastest COMMAND $<TARGET_FILE:omrrastest> --gtest_output=xml:${CMAKE_CURRENT_BINARY_DIR}/omrrastest-results.xml)
+omr_add_test(NAME subscribertest COMMAND $<TARGET_FILE:omrsubscribertest> --gtest_output=xml:${CMAKE_CURRENT_BINARY_DIR}/omrsubscribertest-results.xml)
+omr_add_test(NAME traceoptiontest COMMAND $<TARGET_FILE:omrtraceoptiontest> --gtest_output=xml:${CMAKE_CURRENT_BINARY_DIR}/omrtraceoptiontest-results.xml)
 
 set_target_properties(
 	omrrastest

diff --git a/fvtest/sigtest/CMakeLists.txt b/fvtest/sigtest/CMakeLists.txt
@@ -87,4 +87,4 @@ endif()
 
 set_property(TARGET omrsigtest PROPERTY FOLDER fvtest)
 
-add_test(NAME sigtest COMMAND $<TARGET_FILE:omrsigtest> --gtest_output=xml:${CMAKE_CURRENT_BINARY_DIR}/omrsigtest-results.xml)
+omr_add_test(NAME sigtest COMMAND $<TARGET_FILE:omrsigtest> --gtest_output=xml:${CMAKE_CURRENT_BINARY_DIR}/omrsigtest-results.xml)
diff --git a/fvtest/threadextendedtest/CMakeLists.txt b/fvtest/threadextendedtest/CMakeLists.txt
@@ -44,5 +44,5 @@ endif()
 set_property(TARGET omrthreadextendedtest PROPERTY FOLDER fvtest)
 
 if (NOT OMR_HOST_OS STREQUAL "zos")
-	add_test(NAME threadextendedtest COMMAND $<TARGET_FILE:omrthreadextendedtest> --gtest_output=xml:${CMAKE_CURRENT_BINARY_DIR}/omrthreadextendedtest-results.xml)
+	omr_add_test(NAME threadextendedtest COMMAND $<TARGET_FILE:omrthreadextendedtest> --gtest_output=xml:${CMAKE_CURRENT_BINARY_DIR}/omrthreadextendedtest-results.xml)
 endif()
diff --git a/fvtest/threadtest/CMakeLists.txt b/fvtest/threadtest/CMakeLists.txt
@@ -79,8 +79,8 @@ endif()
 
 set_property(TARGET omrthreadtest PROPERTY FOLDER fvtest)
 
-add_test(NAME threadtest COMMAND $<TARGET_FILE:omrthreadtest> --gtest_output=xml:${CMAKE_CURRENT_BINARY_DIR}/omrthreadtest-results.xml)
-add_test(NAME threadSetAttrThreadWeightTest COMMAND $<TARGET_FILE:omrthreadtest> --gtest_output=xml:${CMAKE_CURRENT_BINARY_DIR}/omrthreadtest-results.xml --gtest_also_run_disabled_tests --gtest_filter=ThreadCreateTest.DISABLED_SetAttrThreadWeight)
+omr_add_test(NAME threadtest COMMAND $<TARGET_FILE:omrthreadtest> --gtest_output=xml:${CMAKE_CURRENT_BINARY_DIR}/omrthreadtest-results.xml)
+omr_add_test(NAME threadSetAttrThreadWeightTest COMMAND $<TARGET_FILE:omrthreadtest> --gtest_output=xml:${CMAKE_CURRENT_BINARY_DIR}/omrthreadtest-results.xml --gtest_also_run_disabled_tests --gtest_filter=ThreadCreateTest.DISABLED_SetAttrThreadWeight)
 if(OMR_HOST_OS STREQUAL "linux")
-	add_test(NAME threadRealtimeTest COMMAND $<TARGET_FILE:omrthreadtest> --gtest_output=xml:${CMAKE_CURRENT_BINARY_DIR}/omrthreadtest-results.xml --gtest_filter=ThreadCreateTest.* -realtime)
+	omr_add_test(NAME threadRealtimeTest COMMAND $<TARGET_FILE:omrthreadtest> --gtest_output=xml:${CMAKE_CURRENT_BINARY_DIR}/omrthreadtest-results.xml --gtest_filter=ThreadCreateTest.* -realtime)
 endif()
diff --git a/fvtest/tril/test/CMakeLists.txt b/fvtest/tril/test/CMakeLists.txt
@@ -55,7 +55,7 @@ target_compile_options(triltest
 
 set_property(TARGET triltest PROPERTY FOLDER fvtest/tril)
 
-add_test(
+omr_add_test(
 	NAME triltest
 	COMMAND $<TARGET_FILE:triltest> --gtest_output=xml:${CMAKE_CURRENT_BINARY_DIR}/triltest-results.xml
 )
diff --git a/fvtest/utiltest/CMakeLists.txt b/fvtest/utiltest/CMakeLists.txt
@@ -40,4 +40,4 @@ endif()
 
 set_property(TARGET omrutiltest PROPERTY FOLDER fvtest)
 
-add_test(NAME utiltest COMMAND $<TARGET_FILE:omrutiltest> --gtest_output=xml:${CMAKE_CURRENT_BINARY_DIR}/omrutiltest-results.xml)
+omr_add_test(NAME utiltest COMMAND $<TARGET_FILE:omrutiltest> --gtest_output=xml:${CMAKE_CURRENT_BINARY_DIR}/omrutiltest-results.xml)
diff --git a/fvtest/vmtest/CMakeLists.txt b/fvtest/vmtest/CMakeLists.txt
@@ -40,4 +40,4 @@ target_link_libraries(omrvmtest
 
 set_property(TARGET omrvmtest PROPERTY FOLDER fvtest)
 
-add_test(NAME vmtest COMMAND $<TARGET_FILE:omrvmtest> --gtest_output=xml:${CMAKE_CURRENT_BINARY_DIR}/omrvmtest-results.xml)
+omr_add_test(NAME vmtest COMMAND $<TARGET_FILE:omrvmtest> --gtest_output=xml:${CMAKE_CURRENT_BINARY_DIR}/omrvmtest-results.xml)
diff --git a/jitbuilder/release/CMakeLists.txt b/jitbuilder/release/CMakeLists.txt
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2017, 2020 IBM Corp. and others
+# Copyright (c) 2017, 2021 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
@@ -20,6 +20,7 @@
 # SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
 ###############################################################################
 
+include(OmrTest)
 
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
@@ -31,7 +32,7 @@ macro(create_jitbuilder_test target)
 	target_link_libraries(${target}
 		jitbuilder
 		${CMAKE_DL_LIBS})
-	add_test(NAME ${target}_example_as_test COMMAND $<TARGET_FILE:${target}>)
+	omr_add_test(NAME ${target}_example_as_test COMMAND $<TARGET_FILE:${target}>)
 endmacro(create_jitbuilder_test)
 
 # Basic Tests: These should run properly on all platforms.