diff options
| author | Artem Dyomin <artem.dyomin@qt.io> | 2023-04-17 14:41:17 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-04-18 15:37:08 +0000 |
| commit | bdc03935a44438c6c5875a48c575ef24225cbb66 (patch) | |
| tree | 89cbc0b65bd63fdf1306dc69d936409bdac05d1b | |
| parent | 0342d969ec0d2dedf950ebf91e3ba8996b470610 (diff) | |
| download | qtmultimedia-bdc03935a44438c6c5875a48c575ef24225cbb66.tar.gz | |
Fix auto tests running on linux CI
Some CI linux tests have been moved to separate targets without
env var FFMPEG_DIR. the current patch applies the same approach
as for macos.
Change-Id: I131473c419e0cb302192ca6d4203bd9ad81769e5
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit 8783dc08547b030be1505b8501ad79b58c765dc5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | coin/instructions/run_ffmpeg_backend_tests.yaml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/coin/instructions/run_ffmpeg_backend_tests.yaml b/coin/instructions/run_ffmpeg_backend_tests.yaml index 21dfe8ba2..eb7dea73c 100644 --- a/coin/instructions/run_ffmpeg_backend_tests.yaml +++ b/coin/instructions/run_ffmpeg_backend_tests.yaml @@ -6,6 +6,15 @@ enable_if: env_var: TARGET_OS_COIN equals_value: macos - condition: runtime + env_var: TARGET_OSVERSION_COIN + contains_value: ubuntu + - condition: runtime + env_var: TARGET_OSVERSION_COIN + contains_value: rhel + - condition: runtime + env_var: TARGET_OSVERSION_COIN + contains_value: opensuse + - condition: runtime env_var: NON_QTBASE_CMAKE_ARGS contains_value: "-DFFMPEG_DIR=/" - condition: runtime |