Run VxWorks tests upstream of QtDeclarative

Set test running to happen on non-developer static target for modules upstream of QtDeclarative. Qtdeclarative tests do not build with static flag, due to this only up to this. Update VSB and VIP. Change-Id: If7e016f11b5d3908dff584fc05bcc8985d471a94 Reviewed-by: Simo Fält <simo.falt@qt.io>
2023-11-23 13:00:08 +02:00 · 2023-11-23 13:00:08 +02:00 · d2d5638f12
parent 0055441fc7
commit d2d5638f12
10 changed files with 45 additions and 24 deletions
--- a/coin/platform_configs/cmake_platforms_qemu_vxworks_buildtest.yaml
+++ b/coin/platform_configs/cmake_platforms_qemu_vxworks_buildtest.yaml
@ -8,8 +8,9 @@ Configurations:
    Compiler: 'Clang'
    Target compiler: 'Clang'
    Platform dependency: 'ubuntu-22.04'
-    Features: ['UseConfigure', 'DoNotRunTests', 'DoNotUploadTests']
+    Features: ['VMSize8', 'UseConfigure', 'DoNotRunTests', 'DoNotUploadTests']
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-release -developer-build -force-debug-info -qpa offscreen -nomake examples',
+        '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'
    ]
--- a/coin/platform_configs/cmake_platforms_qemu_vxworks_buildtest_static.yaml
+++ b/coin/platform_configs/cmake_platforms_qemu_vxworks_buildtest_static.yaml
@ -1,15 +1,16 @@
 Version: 2
 Configurations:
 -
-    Id: 'vxworks-imx6'
+    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', 'DisableTests']
+    Features: ['VMSize8', 'UseConfigure', 'DoNotRunTests', 'DoNotUploadTests']
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-release -developer-build -force-debug-info -qpa eglfs -nomake examples',
+        'WIND_CC_SYSROOT=/opt/fsl_imx6_2_0_6_2_VSB',
+        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -qpa offscreen -nomake examples',
        'TARGET_CMAKE_ARGS=-DBUILD_SHARED_LIBS=OFF -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'
    ]
--- a/coin/platform_configs/cmake_platforms_qemu_vxworks_tests.yaml
+++ b/coin/platform_configs/cmake_platforms_qemu_vxworks_tests.yaml
@ -8,9 +8,10 @@ Configurations:
    Compiler: 'Clang'
    Target compiler: 'Clang'
    Platform dependency: 'vxworks-imx6-buildtest'
-    Features: ['VMSize16', 'InsignificantTests', 'UseConfigure', 'TestOnly', 'BuildTestsInTest', 'DoNotUploadTests']
+    Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-release -developer-build -force-debug-info -qpa offscreen -nomake examples',
-        'TARGET_CMAKE_ARGS=-DBUILD_SHARED_LIBS=OFF -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',
-        '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'
+        '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'
    ]
--- a/coin/platform_configs/cmake_platforms_qemu_vxworks_tests_static.yaml
+++ b/coin/platform_configs/cmake_platforms_qemu_vxworks_tests_static.yaml
@ -0,0 +1,17 @@
+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 -qpa offscreen -nomake examples',
+        'TARGET_CMAKE_ARGS=-DBUILD_SHARED_LIBS=OFF -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'
+    ]
--- a/coin/platform_configs/qtbase.yaml
+++ b/coin/platform_configs/qtbase.yaml
@ -7,9 +7,8 @@ Include: [
    address_sanitizer_platforms.yaml,
    linux_android_tests_multi_abi.yaml,
    wasm_qtbase_tests.yaml,
-    cmake_platforms_qemu_vxworks_buildtest.yaml,
-    cmake_platforms_qemu_vxworks.yaml,
-    cmake_platforms_qemu_vxworks_tests.yaml,
+    cmake_platforms_qemu_vxworks_buildtest_static.yaml,
+    cmake_platforms_qemu_vxworks_tests_static.yaml,
    qtlite.yaml,
    qtbase-linux-arm64-offscreen.yaml,
    qtbase-new-compiler-testing.yaml
--- a/coin/platform_configs/qtimageformats.yaml
+++ b/coin/platform_configs/qtimageformats.yaml
@ -3,6 +3,7 @@ Include: [
    cmake_platforms.yaml,
    address_sanitizer_platforms.yaml,
    integrity.yaml,
-    cmake_platforms_qemu_vxworks_buildtest.yaml
+    cmake_platforms_qemu_vxworks_buildtest_static.yaml,
+    cmake_platforms_qemu_vxworks_tests_static.yaml
 ]
 Configurations: []
--- a/coin/platform_configs/qtlanguageserver.yaml
+++ b/coin/platform_configs/qtlanguageserver.yaml
@ -3,6 +3,7 @@ Include: [
    cmake_platforms.yaml,
    address_sanitizer_platforms.yaml,
    integrity.yaml,
-    cmake_platforms_qemu_vxworks_buildtest.yaml
+    cmake_platforms_qemu_vxworks_buildtest_static.yaml,
+    cmake_platforms_qemu_vxworks_tests_static.yaml
 ]
 Configurations: []
--- a/coin/platform_configs/qtshadertools.yaml
+++ b/coin/platform_configs/qtshadertools.yaml
@ -3,6 +3,7 @@ Include: [
    cmake_platforms.yaml,
    address_sanitizer_platforms.yaml,
    integrity.yaml,
-    cmake_platforms_qemu_vxworks_buildtest.yaml
+    cmake_platforms_qemu_vxworks_buildtest_static.yaml,
+    cmake_platforms_qemu_vxworks_tests_static.yaml
 ]
 Configurations: []
--- a/coin/platform_configs/qtsvg.yaml
+++ b/coin/platform_configs/qtsvg.yaml
@ -3,6 +3,7 @@ Include: [
    cmake_platforms.yaml,
    address_sanitizer_platforms.yaml,
    integrity.yaml,
-    cmake_platforms_qemu_vxworks_buildtest.yaml
+    cmake_platforms_qemu_vxworks_buildtest_static.yaml,
+    cmake_platforms_qemu_vxworks_tests_static.yaml
 ]
 Configurations: []
--- a/coin/provisioning/common/linux/vx_works.sh
+++ b/coin/provisioning/common/linux/vx_works.sh
@ -11,7 +11,6 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

-VXWORKS_VER="23_09"
 ######### VXworks libs #########
 # Installs to /opt/vxworks
 PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/vxworks/vxworks_libs_2403.tar.gz"
@ -21,28 +20,27 @@ targetFolder="/opt"
 InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$sha1" "$targetFolder" ""
 SetEnvVar "VXWORKS_HOME" "/opt/vxworks"

-VXWORKS_BUILD_VER="20240522"
+VXWORKS_BUILD_VER="19-08-2024"
 ######### VXworks toolchain #########
 # Installs to /opt/fsl_imx6_2_0_6_2_VSB
-PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/vxworks/vxworks_vsb_${VXWORKS_BUILD_VER}.tar.gz"
+PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/vxworks/vxworks_arm_vsb_${VXWORKS_BUILD_VER}.tar.gz"
 AltUrl=""
-sha1="b8fd1203aaa0976dbd68ddc94ce0af1b8f89e26f"
+sha1="9c1abcc066aff40230a7f432e1f076bac8c6912a"
 targetFolder="/opt/"
 InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$sha1" "$targetFolder" ""
 SetEnvVar "WIND_CC_SYSROOT" "/opt/fsl_imx6_2_0_6_2_VSB"

-VXWORKS_BUILD_VER="20240619"
 ######### VXworks VIP kernel #########
 # Installs to /opt/fsl_imx6_2_0_6_2_VIP_QEMU
-PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/vxworks/vxworks_vip_${VXWORKS_BUILD_VER}.tar.gz"
+PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/vxworks/vxworks_arm_vip_${VXWORKS_BUILD_VER}.tar.gz"
 AltUrl=""
-sha1="d66aee4054638df50c8be003fecb010374524f14"
+sha1="db48525d9f5b105f9da632f0c3f557247c1fd041"
 targetFolder="/opt/"
 InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$sha1" "$targetFolder" ""
 SetEnvVar "VXWORKS_SSH" "WindRiver@172.31.1.10"

 ######### VXworks fonts and certs #########
-# Installs to /opt/fsl_imx6_2_0_6_2_VIP_QEMU
+# Installs to /opt/fsl_imx6_2_0_6_2_VSB
 PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/vxworks/vxworks_misc.tar.gz"
 AltUrl=""
 sha1="1bc529b90b35b0b249f219e47d5798225a9b68d8"