diff options
| author | Pavel Dubsky <pavel.dubsky@qt.io> | 2024-03-12 21:03:00 +0100 |
|---|---|---|
| committer | Pavel Dubsky <pavel.dubsky@qt.io> | 2024-04-17 16:01:46 +0100 |
| commit | d6642e26cc768b12e87dfea49812439ab0eb164c (patch) | |
| tree | 62601036b90dcfdc7ee547494c577af9cb5dadbf | |
| parent | 6f6050f79f896775bcb3d3a365fc4b282a354593 (diff) | |
Enable QtMultimedia tests without relying on FFMPEG_DIR
This change enables QtMultimedia tests on all non-ARM64 Windows
platforms unconditionally. On ARM64 the check for FFMPEG_DIR is retained.
Fixes: QTBUG-122976
Pick-to: 6.7 6.6 6.5
Change-Id: I24c3f0471a9cbddf869ba68b2f019b5fd93aeab5
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
| -rw-r--r-- | coin/instructions/run_ffmpeg_backend_tests.yaml | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/coin/instructions/run_ffmpeg_backend_tests.yaml b/coin/instructions/run_ffmpeg_backend_tests.yaml index 326b6db3c..92096bd33 100644 --- a/coin/instructions/run_ffmpeg_backend_tests.yaml +++ b/coin/instructions/run_ffmpeg_backend_tests.yaml @@ -20,9 +20,19 @@ enable_if: - condition: runtime env_var: NON_QTBASE_CMAKE_ARGS contains_value: "-DFFMPEG_DIR=/" - - condition: runtime - env_var: NON_QTBASE_CMAKE_ARGS - contains_value: "-DFFMPEG_DIR=C:" + - condition: and + conditions: + - condition: runtime + env_var: TARGET_OS_COIN + equals_value: windows + - condition: or + conditions: + - condition: property + property: target.arch + not_equals_value: arm64 + - condition: runtime + env_var: NON_QTBASE_CMAKE_ARGS + contains_value: "-DFFMPEG_DIR=C:" instructions: - type: EnvironmentVariable variableName: QT_MEDIA_BACKEND |