aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIikka Eklund <iikka.eklund@qt.io>2020-03-30 15:18:59 +0300
committerSimo Fält <simo.falt@qt.io>2021-03-03 09:03:45 +0200
commitbc3e3ad85f05491420433d1c04ccca920d0eadd1 (patch)
treed1efd3a5a3c0cec3a1ded986e33c341ea11ce660
parent7e2fd354b01663040a7b26f804f9ee9f1cec0bb0 (diff)
Enable tests for installer-framework
Remove DisableTests feature from build configurations. Task-number: QTIFW-1638 Change-Id: I6a66547306c732f6c5815e8ca6e8955f55d6cc5b Reviewed-by: Antti Kokko <antti.kokko@qt.io> Reviewed-by: Katja Marttila <katja.marttila@qt.io> (cherry picked from commit 5f1199953ff863047e0eee43bdc412b2759a0472)
-rw-r--r--coin/platform_configs/installer-framework.yaml6
1 files changed, 3 insertions, 3 deletions
diff --git a/coin/platform_configs/installer-framework.yaml b/coin/platform_configs/installer-framework.yaml
index aaa563ef..f50bbdd5 100644
--- a/coin/platform_configs/installer-framework.yaml
+++ b/coin/platform_configs/installer-framework.yaml
@@ -5,19 +5,19 @@ Configurations:
Template: 'qtci-windows-10-x86_64-16'
Compiler: 'MSVC2015'
Target arch: 'x86'
- Features: ['Packaging', 'DisableTests']
+ Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -no-sql-sqlite -no-icu -mp -openssl-linked OPENSSL_LIBS="-llibssl_static -llibcrypto_static -lUser32 -lWs2_32 -lAdvapi32 -lCrypt32" -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -prefix c:\Users\qt\work\install'
Environment variables: ['TARGET_ARCHITECTURE=amd64_x86', 'PATH=%PATH%;%CI_JOM_PATH%;C:\Utils\gnuwin32\bin;']
Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat', 'amd64_x86']
-
Template: 'qtci-macos-10.13-x86_64-2'
Compiler: 'Clang'
- Features: ['Packaging', 'DisableTests']
+ Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -nomake examples -nomake tests -accessibility -static -no-sql-sqlite -qt-zlib -qt-libpng -qt-libjpeg -no-cups -no-freetype -prefix /Users/qt/work/install'
-
Template: 'qtci-linux-RHEL-7.4-x86_64'
Compiler: 'GCC'
- Features: ['Packaging', 'DisableTests']
+ Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -no-sql-sqlite -qt-zlib -qt-libpng -qt-libjpeg -no-cups -openssl-linked -qt-xcb -no-icu -no-libudev -qt-pcre -no-glib -no-egl -no-sm -qt-harfbuzz -prefix /home/qt/work/install OPENSSL_LIBS="{{.Env.OPENSSL_HOME}}/lib/libssl.a {{.Env.OPENSSL_HOME}}/lib/libcrypto.a -ldl -lpthread" -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/libs'
-
Template: 'qtci-linux-RHEL-7.4-x86_64'