diff options
| author | Toni Saario <toni.saario@qt.io> | 2022-05-25 12:04:16 +0300 |
|---|---|---|
| committer | Toni Saario <toni.saario@qt.io> | 2022-09-22 09:46:16 +0000 |
| commit | 2caf376cd144f8c0ddb4741998ab4e4c6c87f5cd (patch) | |
| tree | 7f953ac94d4b7141f49485599f8256b0d805e4af | |
| parent | 00a0bbfc23a68de3b3ec58b680932061b12daa29 (diff) | |
Run bic tests
The way of running bic tests has changed. Now tests need to be run on
qt5 level where all modules are present and intermodule includes can
be handled.
Task-number: QTBUG-100698
Change-Id: Ic68c019988718485201602f279530c501f6e6ba3
Reviewed-by: Simo Fält <simo.falt@qt.io>
| -rw-r--r-- | coin/instructions/coin_bic_tests.yaml | 32 | ||||
| -rw-r--r-- | coin/module_config.yaml | 3 | ||||
| -rw-r--r-- | coin/platform_configs/cmake_platforms.yaml | 2 |
3 files changed, 35 insertions, 2 deletions
diff --git a/coin/instructions/coin_bic_tests.yaml b/coin/instructions/coin_bic_tests.yaml new file mode 100644 index 00000000..bfdb3012 --- /dev/null +++ b/coin/instructions/coin_bic_tests.yaml @@ -0,0 +1,32 @@ +type: Group +instructions: + - type: EnvironmentVariable + variableName: QT_MODULE_TO_TEST + variableValue: "qt=QtConcurrent,QtCore,QtDBus,QtDesigner,QtGui,QtHelp,QtNetwork,QtOpenGL,QtPrintSupport,QtQml,QtQuick,QtQuickTest,QtSql,QtSvg,QtTest,QtWidgets,QtXml;{{.SourceDir}}/qtbase" + - type: EnvironmentVariable + variableName: QTDIR + variableValue: "{{.InstallDir}}" + - type: PrependToEnvironmentVariable + variableName: PATH + variableValue: "{{.InstallDir}}/bin:" + - type: ChangeDirectory + directory: "{{.SourceDir}}/qtqa/tests/postbuild/bic" + - type: ExecuteCommand + command: ["{{.InstallDir}}/bin/qmake"] + maxTimeInSeconds: 3600 + maxTimeBetweenOutput: 300 + userMessageOnFailure: "Failed to execute qmake for bic tests" + - type: ExecuteCommand + command: ["make", "check", "-j1"] + maxTimeInSeconds: 7200 + maxTimeBetweenOutput: 300 + userMessageOnFailure: "Failed to execute bic tests" +enable_if: + condition: and + conditions: + - condition: property + property: features + contains_value: Packaging + - condition: property + property: target.os + equals_value: Linux diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 89175e67..3de784a2 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -8,4 +8,5 @@ instructions: Build: - !include "{{qt/qt5}}/coin_qt_build_template.yaml" - Test: [] + Test: + - !include "{{qt/qt5}}/coin_bic_tests.yaml" diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index c3439759..31b25fcf 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -126,7 +126,7 @@ Configurations: Id: 'RHEL-8.4-host' Template: 'qtci-linux-RHEL-8.4-x86_64-50' Compiler: 'GCC' - Features: ['Packaging', 'Sccache', 'UseConfigure'] + Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies'] Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput' Environment variables: [ 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', |