1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add QNX8.0 CI enablers

Browse Source 
Task-number: QTBUG-131708
Pick-to: 6.9 6.8
Change-Id: I60c1be5fc117e5861147d9b194106b63a8b62aab
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Marianne Yrjänä 2025-02-25 15:40:00 +02:00
parent 32d23904b2
commit f673d38129
8 changed files with 49 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
coin/instructions/cmake_run_ctest.yaml
View File

@ -21,8 +21,8 @@ instructions:
variableValue: " {{.SourceDir}}/coin_qnx_qemu_runner.sh"
enable_if:
condition: property
property: target.osVersion
in_values: [QNX_710]
property: target.os
equals_value: QNX
- type: AppendToEnvironmentVariable
variableName: TESTRUNNER
variableValue: " {{.AgentWorkingDir}}/coin_vxworks_qemu_runner.sh"

8
coin/instructions/cmake_setup_running_tests_env_vars.yaml
View File

@ -18,7 +18,7 @@ instructions:
equals_property: target.os
- condition: property
property: target.osVersion
not_in_values: [QEMU, QNX_710, VxWorks]
not_in_values: [QEMU, QNX_710, QNX_800, VxWorks]
- type: Group
instructions:
- type: EnvironmentVariable
@ -32,7 +32,7 @@ instructions:
equals_property: target.os
- condition: property
property: target.osVersion
not_in_values: [QEMU, QNX_710, VxWorks]
not_in_values: [QEMU, QNX_710, QNX_800, VxWorks]
- type: Group
instructions:
- !include "{{qt/qtbase}}/cmake_setup_running_qnxqemu_tests_env_vars.yaml"
@ -40,8 +40,8 @@ instructions:
condition: and
conditions:
- condition: property
property: target.osVersion
equals_value: QNX_710
property: target.os
equals_value: QNX
- condition: property
property: features
not_contains_value: DisableTests

2
coin/instructions/coin_module_build_template_v2.yaml
View File

@ -64,7 +64,7 @@ instructions:
conditions:
- condition: property
property: target.osVersion
in_values: [Android_ANY, QEMU, IOS_ANY, QNX_710, WebAssembly, INTEGRITY, VxWorks]
in_values: [Android_ANY, QEMU, IOS_ANY, QNX_710, QNX_800, WebAssembly, INTEGRITY, VxWorks]
- condition: and
conditions:
- condition: property

4
coin/instructions/coin_module_test_qnx_start_emulator.yaml
View File

@ -73,8 +73,8 @@ instructions:
condition: and
conditions:
- condition: property
property: target.osVersion
equals_value: QNX_710
property: target.os
equals_value: QNX
- condition: property
property: features
not_contains_value: DisableTests

2
coin/instructions/coin_module_test_template_v2.yaml
View File

@ -24,7 +24,7 @@ instructions:
equals_property: target.os
- condition: property
property: target.osVersion
in_values: [QEMU, QNX_710]
in_values: [QEMU, QNX_710, QNX_800]
disable_if:
condition: or
conditions:

2
coin/instructions/coin_module_test_template_v3.yaml
View File

@ -22,7 +22,7 @@ instructions:
equals_property: target.os
- condition: property
property: target.osVersion
in_values: [QEMU, QNX_710, IOS_ANY]
in_values: [QEMU, QNX_710, QNX_800, IOS_ANY]
- condition: property
property: features
contains_value: AndroidTestRun

2
coin/instructions/coin_qtbase_build_template_v2.yaml
View File

@ -52,7 +52,7 @@ instructions:
conditions:
- condition: property
property: target.osVersion
in_values: [Android_ANY, QEMU, IOS_ANY, QNX_710, WebAssembly, INTEGRITY, VxWorks]
in_values: [Android_ANY, QEMU, IOS_ANY, QNX_710, QNX_800, WebAssembly, INTEGRITY, VxWorks]
- condition: and
conditions:
- condition: property

76
coin/instructions/prepare_building_env.yaml
View File

@ -369,6 +369,22 @@ instructions:
variableValue: "{{.Env.VXWORKS_HOME}}/wrenv.linux"
# QNX variables
- type: EnvironmentVariable
variableName: QNX_ACTIVE
variableValue: "{{.Env.QNX_710}}"
enable_if:
condition: property
property: target.osVersion
equals_value: QNX_710
- type: EnvironmentVariable
variableName: QNX_ACTIVE
variableValue: "{{.Env.QNX_800}}"
enable_if:
condition: property
property: target.osVersion
equals_value: QNX_800
- type: Group
enable_if:
condition: and
@ -380,63 +396,45 @@ instructions:
property: target.os
equals_value: QNX
instructions:
- type: EnvironmentVariable
variableName: QNX_TARGET
variableValue: "{{.Env.QNX_710}}/target/qnx7"
- type: EnvironmentVariable
variableName: QNX_CONFIGURATION_EXCLUSIVE
variableValue: "{{.Env.HOME}}/.qnx"
- type: EnvironmentVariable
variableName: QNX_CONFIGURATION
variableValue: "{{.Env.HOME}}/.qnx"
- type: PrependToEnvironmentVariable
variableName: PATH
variableValue: "{{.Env.QNX_710}}/host/linux/x86_64/usr/bin:"
- type: PrependToEnvironmentVariable
variableName: PATH
variableValue: "{{.Env.QNX_710}}/host/common/bin:"
- type: PrependToEnvironmentVariable
variableName: PATH
variableValue: "{{.Env.HOME}}/.qnx:"
- type: EnvironmentVariable
variableName: QNX_HOST
variableValue: "{{.Env.QNX_710}}/host/linux/x86_64"
- type: AppendToEnvironmentVariable
variableName: PATH
variableValue: ":{{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/../x86_64-pokysdk-linux/usr/bin:"
- type: EnvironmentVariable
variableName: QNX_TARGET
variableValue: "{{.Env.QNX_ACTIVE}}/target/qnx7"
- type: PrependToEnvironmentVariable
variableName: PATH
variableValue: "{{.Env.QNX_ACTIVE}}/host/linux/x86_64/usr/bin:"
- type: PrependToEnvironmentVariable
variableName: PATH
variableValue: "{{.Env.QNX_ACTIVE}}/host/common/bin:"
- type: EnvironmentVariable
variableName: QNX_HOST
variableValue: "{{.Env.QNX_ACTIVE}}/host/linux/x86_64"
- type: Group
- type: SetEnvironmentFromScript
command: "{{.Env.QNX_ACTIVE}}\\qnxsdp-env.bat"
userMessageOnFailure: "Failed to set QNX environment"
maxTimeInSeconds: 60
maxTimeBetweenOutput: 60
enable_if:
condition: and
conditions:
- condition: property
property: host.os
equals_value: Windows
property: target.osVersion
contains_value: QNX
- condition: property
property: target.os
equals_value: QNX
instructions:
- type: EnvironmentVariable
variableName: QNX_TARGET
variableValue: "{{.Env.QNX_710_CMAKE}}/target/qnx7"
- type: EnvironmentVariable
variableName: QNX_CONFIGURATION_EXCLUSIVE
variableValue: "{{.Env.HOMEPATH}}\\.qnx"
- type: EnvironmentVariable
variableName: QNX_CONFIGURATION
variableValue: "{{.Env.HOMEPATH}}\\.qnx"
- type: PrependToEnvironmentVariable
variableName: PATH
variableValue: "{{.Env.QNX_710}}\\host\\win64\\x86_64\\usr\\bin;"
- type: PrependToEnvironmentVariable
variableName: PATH
variableValue: "{{.Env.QNX_710}}\\host\\common\\bin;"
- type: PrependToEnvironmentVariable
variableName: PATH
variableValue: "{{.Env.HOMEPATH}}\\.qnx;"
- type: EnvironmentVariable
variableName: QNX_HOST
variableValue: "{{.Env.QNX_710}}\\host\\win64\\x86_64"
property: host.os
contains_value: Windows
# Enable warnings are errors
- type: Group