Try to consolidate Unix/Windows libexec directory in coin configs
Change-Id: Ie381cb062fc78fe5c291b8d0b49fca5f752c7c30 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
parent
fe0e87c9a6
commit
1eb2d4d0da
@ -10,11 +10,7 @@ instructions:
|
|||||||
equals_value: Windows
|
equals_value: Windows
|
||||||
- type: EnvironmentVariable
|
- type: EnvironmentVariable
|
||||||
variableName: TESTRUNNER
|
variableName: TESTRUNNER
|
||||||
variableValue: "{{.InstallDir}}/libexec/qt-testrunner.py --"
|
variableValue: "{{.Env.LIBEXEC_INSTALL_DIR}}qt-testrunner.py --"
|
||||||
disable_if:
|
|
||||||
condition: property
|
|
||||||
property: host.os
|
|
||||||
equals_value: Windows
|
|
||||||
- type: AppendToEnvironmentVariable
|
- type: AppendToEnvironmentVariable
|
||||||
variableName: TESTRUNNER
|
variableName: TESTRUNNER
|
||||||
variableValue: " {{.SourceDir}}/coin_qnx_qemu_runner.sh"
|
variableValue: " {{.SourceDir}}/coin_qnx_qemu_runner.sh"
|
||||||
@ -22,13 +18,6 @@ instructions:
|
|||||||
condition: property
|
condition: property
|
||||||
property: target.osVersion
|
property: target.osVersion
|
||||||
in_values: [QNX_710]
|
in_values: [QNX_710]
|
||||||
- type: EnvironmentVariable
|
|
||||||
variableName: TESTRUNNER
|
|
||||||
variableValue: "{{.InstallDir}}\\bin\\qt-testrunner.py --"
|
|
||||||
enable_if:
|
|
||||||
condition: property
|
|
||||||
property: host.os
|
|
||||||
equals_value: Windows
|
|
||||||
- type: Group
|
- type: Group
|
||||||
enable_if:
|
enable_if:
|
||||||
condition: property
|
condition: property
|
||||||
@ -42,7 +31,7 @@ instructions:
|
|||||||
# Override qt-testrunner as we don't want to gather test statistics
|
# Override qt-testrunner as we don't want to gather test statistics
|
||||||
# because many tests FAIL when built with ASAN.
|
# because many tests FAIL when built with ASAN.
|
||||||
variableName: TESTRUNNER
|
variableName: TESTRUNNER
|
||||||
variableValue: "{{.InstallDir}}/libexec/sanitizer-testrunner.py"
|
variableValue: "{{.Env.LIBEXEC_INSTALL_DIR}}sanitizer-testrunner.py"
|
||||||
- type: EnvironmentVariable
|
- type: EnvironmentVariable
|
||||||
variableName: COIN_CTEST_RESULTSDIR
|
variableName: COIN_CTEST_RESULTSDIR
|
||||||
variableValue: "{{.AgentWorkingDir}}\\testresults"
|
variableValue: "{{.AgentWorkingDir}}\\testresults"
|
||||||
|
@ -26,6 +26,20 @@ instructions:
|
|||||||
property: host.os
|
property: host.os
|
||||||
equals_value: Windows
|
equals_value: Windows
|
||||||
|
|
||||||
|
- type: EnvironmentVariable
|
||||||
|
variableName: LIBEXEC_INSTALL_DIR
|
||||||
|
variableValue: "{{.InstallDir}}\\bin\\"
|
||||||
|
enable_if:
|
||||||
|
condition: property
|
||||||
|
property: host.os
|
||||||
|
equals_value: Windows
|
||||||
|
- type: EnvironmentVariable
|
||||||
|
variableName: LIBEXEC_INSTALL_DIR
|
||||||
|
variableValue: "{{.InstallDir}}/libexec/"
|
||||||
|
disable_if:
|
||||||
|
condition: property
|
||||||
|
property: host.os
|
||||||
|
equals_value: Windows
|
||||||
|
|
||||||
# Export ICC specific env. variables
|
# Export ICC specific env. variables
|
||||||
- type: Group
|
- type: Group
|
||||||
|
Loading…
x
Reference in New Issue
Block a user