From 30a5e2f7ce939e57731bc86044cac65e9c602099 Mon Sep 17 00:00:00 2001 From: Toni Saario Date: Fri, 1 Nov 2024 15:41:26 +0200 Subject: [PATCH] Coin: Adjust VxWorks significant flags and building Enable test building for all modules VxWorks is to be ported to. Set modules that fail as insignificant. Keep x86_64 target as insignificantTests, due to it requiring change in qtbase, after which it can be default significant. Change-Id: I3c373a2a548c71515901c180e299738f5326c8a4 Reviewed-by: Jukka Jokiniva --- .../cmake_platforms_qemu_vxworks_buildtest.yaml | 16 ---------------- .../cmake_platforms_qemu_vxworks_tests.yaml | 17 ----------------- coin/platform_configs/qtbase.yaml | 5 ++++- coin/platform_configs/qtcharts.yaml | 12 +++++++++++- coin/platform_configs/qtdeclarative.yaml | 11 ++++++++++- coin/platform_configs/qtgraphs.yaml | 8 +++++++- coin/platform_configs/qtgrpc.yaml | 8 +++++++- coin/platform_configs/qtimageformats.yaml | 5 +++++ coin/platform_configs/qtmultimedia.yaml | 3 ++- coin/platform_configs/qtquick3d.yaml | 8 +++++++- coin/platform_configs/qtquicktimeline.yaml | 3 ++- coin/platform_configs/qtvirtualkeyboard.yaml | 11 ++++++++++- 12 files changed, 65 insertions(+), 42 deletions(-) delete mode 100644 coin/platform_configs/cmake_platforms_qemu_vxworks_buildtest.yaml delete mode 100644 coin/platform_configs/cmake_platforms_qemu_vxworks_tests.yaml diff --git a/coin/platform_configs/cmake_platforms_qemu_vxworks_buildtest.yaml b/coin/platform_configs/cmake_platforms_qemu_vxworks_buildtest.yaml deleted file mode 100644 index 02125fd3..00000000 --- a/coin/platform_configs/cmake_platforms_qemu_vxworks_buildtest.yaml +++ /dev/null @@ -1,16 +0,0 @@ -Version: 2 -Configurations: -- - Id: 'vxworks-imx6-buildtest' - Template: 'qtci-linux-Ubuntu-22.04-x86_64-51' - Target os: 'VxWorks' - Target arch: 'ARMv7' - Compiler: 'Clang' - Target compiler: 'Clang' - Platform dependency: 'ubuntu-22.04' - Features: ['VMSize8', 'UseConfigure', 'DoNotRunTests', 'DoNotUploadTests'] - Environment variables: [ - 'WIND_CC_SYSROOT=/opt/fsl_imx6_2_0_6_2_VSB', - 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -qpa offscreen -nomake examples', - 'TARGET_CMAKE_ARGS=-DBUILD_SHARED_LIBS=ON -DWARNINGS_ARE_ERRORS=OFF -DCMAKE_TOOLCHAIN_FILE="{{.Env.WIND_CC_SYSROOT}}/mk/rtp.toolchain.cmake" -DFEATURE_vulkan=OFF -DQT_QMAKE_TARGET_MKSPEC=vxworks-clang -DQT_HOST_PATH=/home/qt/work/install -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_STAGING_PREFIX:PATH=/home/qt/work/install/target' - ] diff --git a/coin/platform_configs/cmake_platforms_qemu_vxworks_tests.yaml b/coin/platform_configs/cmake_platforms_qemu_vxworks_tests.yaml deleted file mode 100644 index f1d5d773..00000000 --- a/coin/platform_configs/cmake_platforms_qemu_vxworks_tests.yaml +++ /dev/null @@ -1,17 +0,0 @@ -Version: 2 -Configurations: -- - Id: 'vxworks-imx6-tests' - Template: 'qtci-linux-Ubuntu-22.04-x86_64-51' - Target os: 'VxWorks' - Target arch: 'ARMv7' - Compiler: 'Clang' - Target compiler: 'Clang' - Platform dependency: 'vxworks-imx6-buildtest' - Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] - Environment variables: [ - 'WIND_CC_SYSROOT=/opt/fsl_imx6_2_0_6_2_VSB', - 'VXWORKS_TEST_LIBS_PATH=/opt/fsl_imx6_2_0_6_2_VSB/usr/lib/common;/opt/fsl_imx6_2_0_6_2_VSB/usr/root/llvm/bin;/opt/fsl_imx6_2_0_6_2_VSB/usr/3pp/develop/usr/lib;/home/qt/work/install/target/lib', - 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -qpa offscreen -nomake examples', - 'TARGET_CMAKE_ARGS=-DBUILD_SHARED_LIBS=ON -DWARNINGS_ARE_ERRORS=OFF -DCMAKE_TOOLCHAIN_FILE="{{.Env.WIND_CC_SYSROOT}}/mk/rtp.toolchain.cmake" -DFEATURE_vulkan=OFF -DQT_QMAKE_TARGET_MKSPEC=vxworks-clang -DQT_HOST_PATH=/home/qt/work/install -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_STAGING_PREFIX:PATH=/home/qt/work/install/target' - ] diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index d439677c..eea3b141 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -14,7 +14,10 @@ Include: [ ] Configurations: [] Overrides: -# Make VxWorks imx6 tests insignificant. +# Make VxWorks tests insignificant. - Id: 'vxworks-imx6-tests' Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] +- + Id: 'vxworks-x86_64-tests' + Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] diff --git a/coin/platform_configs/qtcharts.yaml b/coin/platform_configs/qtcharts.yaml index 781c6370..f38904c8 100644 --- a/coin/platform_configs/qtcharts.yaml +++ b/coin/platform_configs/qtcharts.yaml @@ -1,6 +1,16 @@ Version: 2 Include: [ cmake_platforms.yaml, - address_sanitizer_platforms.yaml + address_sanitizer_platforms.yaml, + cmake_platforms_qemu_vxworks_buildtest_static.yaml, + cmake_platforms_qemu_vxworks_tests_static.yaml ] Configurations: [] +Overrides: +# Make VxWorks tests insignificant. +- + Id: 'vxworks-imx6-tests' + Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] +- + Id: 'vxworks-x86_64-tests' + Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] diff --git a/coin/platform_configs/qtdeclarative.yaml b/coin/platform_configs/qtdeclarative.yaml index 20d6208f..f444fd1c 100644 --- a/coin/platform_configs/qtdeclarative.yaml +++ b/coin/platform_configs/qtdeclarative.yaml @@ -5,7 +5,16 @@ Include: [ ios-tests.yaml, address_sanitizer_platforms.yaml, cmake_platforms_static_tests.yaml, - cmake_platforms_qemu_vxworks_buildtest.yaml, + cmake_platforms_qemu_vxworks_buildtest_static.yaml, + cmake_platforms_qemu_vxworks_tests_static.yaml, qtlite.yaml ] Configurations: [] +Overrides: +# Make VxWorks tests insignificant. +- + Id: 'vxworks-imx6-tests' + Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] +- + Id: 'vxworks-x86_64-tests' + Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] diff --git a/coin/platform_configs/qtgraphs.yaml b/coin/platform_configs/qtgraphs.yaml index a0af1a61..4f61e54a 100644 --- a/coin/platform_configs/qtgraphs.yaml +++ b/coin/platform_configs/qtgraphs.yaml @@ -1,7 +1,13 @@ Version: 2 Include: [ cmake_platforms.yaml, - cmake_platforms_qemu_vxworks_buildtest.yaml, + cmake_platforms_qemu_vxworks_buildtest_static.yaml, + cmake_platforms_qemu_vxworks_tests_static.yaml, address_sanitizer_platforms.yaml ] Configurations: [] +Overrides: +# Make VxWorks arm tests insignificant. +- + Id: 'vxworks-imx6-tests' + Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] diff --git a/coin/platform_configs/qtgrpc.yaml b/coin/platform_configs/qtgrpc.yaml index d02c2aeb..e6108d62 100644 --- a/coin/platform_configs/qtgrpc.yaml +++ b/coin/platform_configs/qtgrpc.yaml @@ -1,7 +1,13 @@ Version: 2 Include: [ cmake_platforms.yaml, - cmake_platforms_qemu_vxworks_buildtest.yaml, + cmake_platforms_qemu_vxworks_buildtest_static.yaml, + cmake_platforms_qemu_vxworks_tests_static.yaml, address_sanitizer_platforms.yaml ] Configurations: [] +Overrides: +# Make VxWorks arm tests insignificant. +- + Id: 'vxworks-imx6-tests' + Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] diff --git a/coin/platform_configs/qtimageformats.yaml b/coin/platform_configs/qtimageformats.yaml index 7048eb13..086990d7 100644 --- a/coin/platform_configs/qtimageformats.yaml +++ b/coin/platform_configs/qtimageformats.yaml @@ -7,3 +7,8 @@ Include: [ cmake_platforms_qemu_vxworks_tests_static.yaml ] Configurations: [] +Overrides: +# Make VxWorks x86_64 tests insignificant. +- + Id: 'vxworks-x86_64-tests' + Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] diff --git a/coin/platform_configs/qtmultimedia.yaml b/coin/platform_configs/qtmultimedia.yaml index a0af1a61..be582f53 100644 --- a/coin/platform_configs/qtmultimedia.yaml +++ b/coin/platform_configs/qtmultimedia.yaml @@ -1,7 +1,8 @@ Version: 2 Include: [ cmake_platforms.yaml, - cmake_platforms_qemu_vxworks_buildtest.yaml, + cmake_platforms_qemu_vxworks_buildtest_static.yaml, + cmake_platforms_qemu_vxworks_tests_static.yaml, address_sanitizer_platforms.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtquick3d.yaml b/coin/platform_configs/qtquick3d.yaml index 9b12dbe8..fac4ba00 100644 --- a/coin/platform_configs/qtquick3d.yaml +++ b/coin/platform_configs/qtquick3d.yaml @@ -2,7 +2,13 @@ Version: 2 Include: [ cmake_platforms.yaml, integrity.yaml, - cmake_platforms_qemu_vxworks_buildtest.yaml, + cmake_platforms_qemu_vxworks_buildtest_static.yaml, + cmake_platforms_qemu_vxworks_tests_static.yaml, address_sanitizer_platforms.yaml ] Configurations: [] +Overrides: +# Make VxWorks x86_64 tests insignificant. +- + Id: 'vxworks-x86_64-tests' + Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] diff --git a/coin/platform_configs/qtquicktimeline.yaml b/coin/platform_configs/qtquicktimeline.yaml index a0af1a61..be582f53 100644 --- a/coin/platform_configs/qtquicktimeline.yaml +++ b/coin/platform_configs/qtquicktimeline.yaml @@ -1,7 +1,8 @@ Version: 2 Include: [ cmake_platforms.yaml, - cmake_platforms_qemu_vxworks_buildtest.yaml, + cmake_platforms_qemu_vxworks_buildtest_static.yaml, + cmake_platforms_qemu_vxworks_tests_static.yaml, address_sanitizer_platforms.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtvirtualkeyboard.yaml b/coin/platform_configs/qtvirtualkeyboard.yaml index a0af1a61..e20587af 100644 --- a/coin/platform_configs/qtvirtualkeyboard.yaml +++ b/coin/platform_configs/qtvirtualkeyboard.yaml @@ -1,7 +1,16 @@ Version: 2 Include: [ cmake_platforms.yaml, - cmake_platforms_qemu_vxworks_buildtest.yaml, + cmake_platforms_qemu_vxworks_buildtest_static.yaml, + cmake_platforms_qemu_vxworks_tests_static.yaml, address_sanitizer_platforms.yaml ] Configurations: [] +Overrides: +# Make VxWorks tests insignificant. +- + Id: 'vxworks-imx6-tests' + Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] +- + Id: 'vxworks-x86_64-tests' + Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']