From bd501fbc6ad11f6626d4d0478a45a6a55e08c6dd Mon Sep 17 00:00:00 2001 From: Jan Vrany Date: Fri, 22 Jan 2021 06:51:27 +0000 Subject: [PATCH] CMake: disable porttests when running tests under simulator Since port tests are known to fail (due to limitations of the simulator), this commit disables port tests in cross-compilation builds. Signed-off-by: Jan Vrany --- fvtest/porttest/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fvtest/porttest/CMakeLists.txt b/fvtest/porttest/CMakeLists.txt index e8d68fe1f1e..1e07ebfd856 100644 --- a/fvtest/porttest/CMakeLists.txt +++ b/fvtest/porttest/CMakeLists.txt @@ -124,7 +124,7 @@ if(OMR_HOST_OS STREQUAL "aix") PRIVATE ${OMR_PLATFORM_SHARED_COMPILE_OPTIONS} ) - + set_target_properties(aixbaddep PROPERTIES LINK_FLAGS "-bI:${CMAKE_CURRENT_SOURCE_DIR}/aixbaddep/dummy.imp" @@ -136,10 +136,10 @@ if(OMR_HOST_OS STREQUAL "aix") ) endif() -if (NOT OMR_HOST_OS STREQUAL "aix" AND NOT OMR_HOST_OS STREQUAL "zos") +if (NOT OMR_HOST_OS STREQUAL "aix" AND NOT OMR_HOST_OS STREQUAL "zos" AND NOT CMAKE_CROSSCOMPILING) omr_add_test( NAME porttest - COMMAND $ --gtest_output=xml:${CMAKE_CURRENT_BINARY_DIR}/omrporttest-results.xml + COMMAND $ --gtest_output=xml:${CMAKE_CURRENT_BINARY_DIR}/omrporttest-results.xml --gtest_filter=${porttest_filter} ) endif()