From 5d0466b627537eec123c175327e5becd937a8137 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Cie=C5=9Blak?= <michalcieslak@status.im>
Date: Wed, 18 Oct 2023 09:51:13 +0200
Subject: [PATCH] General: Exclude Storybook's PageValildator to separate
 target in Makefile to mitigate QTBUG-92236

This workaround can be removed after full migration to Qt >= 5.15.4
---
 Makefile                |  7 ++++++-
 ci/Jenkinsfile.tests-ui | 14 ++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 28c27b32e5..bea8a52215 100644
--- a/Makefile
+++ b/Makefile
@@ -360,7 +360,12 @@ run-storybook: storybook-build
 
 run-storybook-tests: storybook-build
 	echo -e "\033[92mRunning:\033[39m Storybook Tests"
-	ctest -V --test-dir $(STORYBOOK_BUILD_PATH)
+	ctest -V --test-dir $(STORYBOOK_BUILD_PATH) -E PagesValidator
+
+# repeat because of https://bugreports.qt.io/browse/QTBUG-92236 (Qt < 5.15.4)
+run-storybook-pages-validator: storybook-build
+	echo -e "\033[92mRunning:\033[39m Storybook Pages Validator"
+	ctest -V --test-dir $(STORYBOOK_BUILD_PATH) -R PagesValidator --repeat until-pass:3
 
 storybook-clean:
 	echo -e "\033[92mCleaning:\033[39m Storybook"
diff --git a/ci/Jenkinsfile.tests-ui b/ci/Jenkinsfile.tests-ui
index f74002659d..9557cf6a67 100644
--- a/ci/Jenkinsfile.tests-ui
+++ b/ci/Jenkinsfile.tests-ui
@@ -103,6 +103,20 @@ pipeline {
       } }
     }
 
+    stage('Check Storybook Pages Validator') {
+      steps { script {
+        /* Needed for QGuiApplication to import QtQuick.Dialogs */
+        wrap([
+          $class: 'Xvfb',
+          autoDisplayName: true,
+          parallelBuild: true,
+          screen: '2560x1440x24',
+        ]) {
+          sh('make run-storybook-pages-validator')
+        }
+      } }
+    }
+
     stage('Upload') {
       steps { script {
         env.PKG_URL = "${currentBuild.absoluteUrl}/consoleText"