Skip to content

Commit f673d38

Browse files
author
Marianne Yrjänä
committed
Add QNX8.0 CI enablers
Task-number: QTBUG-131708 Pick-to: 6.9 6.8 Change-Id: I60c1be5fc117e5861147d9b194106b63a8b62aab Reviewed-by: Alexandru Croitor <[email protected]>
1 parent 32d2390 commit f673d38

8 files changed

+47
-49
lines changed

‎coin/instructions/cmake_run_ctest.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ instructions:
2121
variableValue: " {{.SourceDir}}/coin_qnx_qemu_runner.sh"
2222
enable_if:
2323
condition: property
24-
property: target.osVersion
25-
in_values: [QNX_710]
24+
property: target.os
25+
equals_value: QNX
2626
- type: AppendToEnvironmentVariable
2727
variableName: TESTRUNNER
2828
variableValue: " {{.AgentWorkingDir}}/coin_vxworks_qemu_runner.sh"

‎coin/instructions/cmake_setup_running_tests_env_vars.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ instructions:
1818
equals_property: target.os
1919
- condition: property
2020
property: target.osVersion
21-
not_in_values: [QEMU, QNX_710, VxWorks]
21+
not_in_values: [QEMU, QNX_710, QNX_800, VxWorks]
2222
- type: Group
2323
instructions:
2424
- type: EnvironmentVariable
@@ -32,16 +32,16 @@ instructions:
3232
equals_property: target.os
3333
- condition: property
3434
property: target.osVersion
35-
not_in_values: [QEMU, QNX_710, VxWorks]
35+
not_in_values: [QEMU, QNX_710, QNX_800, VxWorks]
3636
- type: Group
3737
instructions:
3838
- !include "{{qt/qtbase}}/cmake_setup_running_qnxqemu_tests_env_vars.yaml"
3939
enable_if:
4040
condition: and
4141
conditions:
4242
- condition: property
43-
property: target.osVersion
44-
equals_value: QNX_710
43+
property: target.os
44+
equals_value: QNX
4545
- condition: property
4646
property: features
4747
not_contains_value: DisableTests

‎coin/instructions/coin_module_build_template_v2.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ instructions:
6464
conditions:
6565
- condition: property
6666
property: target.osVersion
67-
in_values: [Android_ANY, QEMU, IOS_ANY, QNX_710, WebAssembly, INTEGRITY, VxWorks]
67+
in_values: [Android_ANY, QEMU, IOS_ANY, QNX_710, QNX_800, WebAssembly, INTEGRITY, VxWorks]
6868
- condition: and
6969
conditions:
7070
- condition: property

‎coin/instructions/coin_module_test_qnx_start_emulator.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ instructions:
7373
condition: and
7474
conditions:
7575
- condition: property
76-
property: target.osVersion
77-
equals_value: QNX_710
76+
property: target.os
77+
equals_value: QNX
7878
- condition: property
7979
property: features
8080
not_contains_value: DisableTests

‎coin/instructions/coin_module_test_template_v2.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ instructions:
2424
equals_property: target.os
2525
- condition: property
2626
property: target.osVersion
27-
in_values: [QEMU, QNX_710]
27+
in_values: [QEMU, QNX_710, QNX_800]
2828
disable_if:
2929
condition: or
3030
conditions:

‎coin/instructions/coin_module_test_template_v3.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ instructions:
2222
equals_property: target.os
2323
- condition: property
2424
property: target.osVersion
25-
in_values: [QEMU, QNX_710, IOS_ANY]
25+
in_values: [QEMU, QNX_710, QNX_800, IOS_ANY]
2626
- condition: property
2727
property: features
2828
contains_value: AndroidTestRun

‎coin/instructions/coin_qtbase_build_template_v2.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ instructions:
5252
conditions:
5353
- condition: property
5454
property: target.osVersion
55-
in_values: [Android_ANY, QEMU, IOS_ANY, QNX_710, WebAssembly, INTEGRITY, VxWorks]
55+
in_values: [Android_ANY, QEMU, IOS_ANY, QNX_710, QNX_800, WebAssembly, INTEGRITY, VxWorks]
5656
- condition: and
5757
conditions:
5858
- condition: property

‎coin/instructions/prepare_building_env.yaml

+35-37
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,22 @@ instructions:
369369
variableValue: "{{.Env.VXWORKS_HOME}}/wrenv.linux"
370370

371371
# QNX variables
372+
- type: EnvironmentVariable
373+
variableName: QNX_ACTIVE
374+
variableValue: "{{.Env.QNX_710}}"
375+
enable_if:
376+
condition: property
377+
property: target.osVersion
378+
equals_value: QNX_710
379+
380+
- type: EnvironmentVariable
381+
variableName: QNX_ACTIVE
382+
variableValue: "{{.Env.QNX_800}}"
383+
enable_if:
384+
condition: property
385+
property: target.osVersion
386+
equals_value: QNX_800
387+
372388
- type: Group
373389
enable_if:
374390
condition: and
@@ -380,63 +396,45 @@ instructions:
380396
property: target.os
381397
equals_value: QNX
382398
instructions:
383-
- type: EnvironmentVariable
384-
variableName: QNX_TARGET
385-
variableValue: "{{.Env.QNX_710}}/target/qnx7"
386399
- type: EnvironmentVariable
387400
variableName: QNX_CONFIGURATION_EXCLUSIVE
388401
variableValue: "{{.Env.HOME}}/.qnx"
389402
- type: EnvironmentVariable
390403
variableName: QNX_CONFIGURATION
391404
variableValue: "{{.Env.HOME}}/.qnx"
392-
- type: PrependToEnvironmentVariable
393-
variableName: PATH
394-
variableValue: "{{.Env.QNX_710}}/host/linux/x86_64/usr/bin:"
395-
- type: PrependToEnvironmentVariable
396-
variableName: PATH
397-
variableValue: "{{.Env.QNX_710}}/host/common/bin:"
398405
- type: PrependToEnvironmentVariable
399406
variableName: PATH
400407
variableValue: "{{.Env.HOME}}/.qnx:"
401-
- type: EnvironmentVariable
402-
variableName: QNX_HOST
403-
variableValue: "{{.Env.QNX_710}}/host/linux/x86_64"
404408
- type: AppendToEnvironmentVariable
405409
variableName: PATH
406410
variableValue: ":{{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/../x86_64-pokysdk-linux/usr/bin:"
407-
408-
- type: Group
409-
enable_if:
410-
condition: and
411-
conditions:
412-
- condition: property
413-
property: host.os
414-
equals_value: Windows
415-
- condition: property
416-
property: target.os
417-
equals_value: QNX
418-
instructions:
419411
- type: EnvironmentVariable
420412
variableName: QNX_TARGET
421-
variableValue: "{{.Env.QNX_710_CMAKE}}/target/qnx7"
422-
- type: EnvironmentVariable
423-
variableName: QNX_CONFIGURATION_EXCLUSIVE
424-
variableValue: "{{.Env.HOMEPATH}}\\.qnx"
425-
- type: EnvironmentVariable
426-
variableName: QNX_CONFIGURATION
427-
variableValue: "{{.Env.HOMEPATH}}\\.qnx"
428-
- type: PrependToEnvironmentVariable
429-
variableName: PATH
430-
variableValue: "{{.Env.QNX_710}}\\host\\win64\\x86_64\\usr\\bin;"
413+
variableValue: "{{.Env.QNX_ACTIVE}}/target/qnx7"
431414
- type: PrependToEnvironmentVariable
432415
variableName: PATH
433-
variableValue: "{{.Env.QNX_710}}\\host\\common\\bin;"
416+
variableValue: "{{.Env.QNX_ACTIVE}}/host/linux/x86_64/usr/bin:"
434417
- type: PrependToEnvironmentVariable
435418
variableName: PATH
436-
variableValue: "{{.Env.HOMEPATH}}\\.qnx;"
419+
variableValue: "{{.Env.QNX_ACTIVE}}/host/common/bin:"
437420
- type: EnvironmentVariable
438421
variableName: QNX_HOST
439-
variableValue: "{{.Env.QNX_710}}\\host\\win64\\x86_64"
422+
variableValue: "{{.Env.QNX_ACTIVE}}/host/linux/x86_64"
423+
424+
- type: SetEnvironmentFromScript
425+
command: "{{.Env.QNX_ACTIVE}}\\qnxsdp-env.bat"
426+
userMessageOnFailure: "Failed to set QNX environment"
427+
maxTimeInSeconds: 60
428+
maxTimeBetweenOutput: 60
429+
enable_if:
430+
condition: and
431+
conditions:
432+
- condition: property
433+
property: target.osVersion
434+
contains_value: QNX
435+
- condition: property
436+
property: host.os
437+
contains_value: Windows
440438

441439
# Enable warnings are errors
442440
- type: Group

0 commit comments

Comments
 (0)