diff options
author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2022-11-21 15:54:52 +0100 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2022-12-06 15:17:40 +0100 |
commit | 21be8b0c057bee1da0da40ff026c8cb97ab0740e (patch) | |
tree | adab622e53b23e344c67dfa41cbbde27521110b7 /coin | |
parent | 5091ac1c2cf525dc9adc66776c5e97330766362e (diff) |
Run tests with FFMpeg backend on macOS without depending on CMake variable
The mechanism employed where a CI test configuration would add
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}' to its
environment variables to trigger QT_MEDIA_BACKEND=ffmpeg, was
needlessly indirect and based on conditions that didn't make
sense.
The logic now lives in the qtmultimedia repository.
Change-Id: I46b8fc1df45676b060157bfd670e9971980f0369
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
Diffstat (limited to 'coin')
-rw-r--r-- | coin/platform_configs/macos.yaml | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index 41075a54..e527cf65 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -42,63 +42,42 @@ Configurations: Compiler: 'Clang' Features: ['Sccache', 'TestOnly', 'Packaging'] Platform dependency: 'macos-latest-xcode-universal-packaging-build' - Environment variables: [ - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}' - ] - Id: 'macos-11-arm64-tests' Template: 'qtci-macos-11.0-arm64' Compiler: 'Clang' Features: ['Sccache', 'TestOnly', 'Packaging'] Platform dependency: 'macos-latest-xcode-universal-packaging-build' - Environment variables: [ - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}' - ] - Id: 'macos-12-arm64-tests' Template: 'qtci-macos-12-arm64' Compiler: 'Clang' Features: ['Sccache', 'TestOnly', 'Packaging'] Platform dependency: 'macos-latest-xcode-universal-packaging-build' - Environment variables: [ - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}' - ] - Id: 'macos-13-arm64-tests' Template: 'qtci-macos-13-arm64' Compiler: 'Clang' Features: ['Sccache', 'TestOnly', 'Packaging'] Platform dependency: 'macos-latest-xcode-universal-packaging-build' - Environment variables: [ - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}' - ] - Id: 'macos-12-x86_64-tests' Template: 'qtci-macos-12-x86_64-105' Compiler: 'Clang' Features: ['Sccache', 'TestOnly', 'Packaging'] Platform dependency: 'macos-latest-xcode-universal-packaging-build' - Environment variables: [ - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}' - ] - Id: 'macos-12-arm64-arm64-universal-build-tests' Template: 'qtci-macos-12-arm64' Compiler: 'Clang' Features: ['Sccache', 'TestOnly'] Platform dependency: 'macos-latest-xcode-arm64-universal-build' - Environment variables: [ - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}' - ] - Id: 'macos-12-x86_64-arm64-universal-build-tests' Template: 'qtci-macos-12-x86_64-105' Compiler: 'Clang' Features: ['Sccache', 'TestOnly'] Platform dependency: 'macos-latest-xcode-arm64-universal-build' - Environment variables: [ - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}' - ] # ========================================================================= # Developer build. Single architecture builds. @@ -138,42 +117,27 @@ Configurations: Compiler: 'Clang' Features: ['Sccache', 'TestOnly'] Platform dependency: 'macos-latest-xcode-x86_64-developer-build' - Environment variables: [ - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}' - ] - Id: 'macos-11-arm64-developer-build-tests' Template: 'qtci-macos-11.0-arm64' Compiler: 'Clang' Features: ['TestOnly'] Platform dependency: 'macos-latest-xcode-arm64-developer-build' - Environment variables: [ - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}' - ] - Id: 'macos-12-x86_64-developer-build-tests' Template: 'qtci-macos-12-x86_64-105' Compiler: 'Clang' Features: ['Sccache', 'TestOnly'] Platform dependency: 'macos-latest-xcode-x86_64-developer-build' - Environment variables: [ - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}' - ] - Id: 'macos-12-arm64-developer-build-tests' Template: 'qtci-macos-12-arm64' Compiler: 'Clang' Features: ['TestOnly'] Platform dependency: 'macos-latest-xcode-arm64-developer-build' - Environment variables: [ - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}' - ] - Id: 'macos-13-arm64-developer-build-tests' Template: 'qtci-macos-13-arm64' Compiler: 'Clang' Features: ['TestOnly'] Platform dependency: 'macos-latest-xcode-arm64-developer-build' - Environment variables: [ - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}' - ] |