From d5381608baa52bc6799cff2d66d2c859d1af3f79 Mon Sep 17 00:00:00 2001
From: Toni Saario <toni.saario@qt.io>
Date: Wed, 25 May 2022 12:04:16 +0300
Subject: [PATCH] Run bic tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Simo Fält <simo.falt@qt.io>
---
 coin/instructions/coin_bic_tests.yaml      | 32 ++++++++++++++++++++++
 coin/module_config.yaml                    |  3 +-
 coin/platform_configs/cmake_platforms.yaml |  2 +-
 3 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 coin/instructions/coin_bic_tests.yaml

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 450c465f..e1f2ed39 100644
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -144,7 +144,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',