From 655e8113cd7ebe90da4036e8c1f4752e55a6dae5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= <jedrzej.nowacki@qt.io>
Date: Mon, 1 Jul 2019 15:01:33 +0200
Subject: [PATCH] Skip building tests for static builds

We do not run the test in such configuration. In theory the build
should success (it doesn't for now) but it creates a lot of data.
So the coverage gain vs cost ratio is not great.

This workaround aims to unblock cmake builds.

Change-Id: Icd730d88bf800ee2e7764704a92238ec147d47f9
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
---
 coin/module_config.yaml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/coin/module_config.yaml b/coin/module_config.yaml
index 5972090fbf..421aad601f 100644
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@@ -189,9 +189,18 @@ call_cmake_instructions: &call_cmake
         property: host.os
         equals_value: Windows
 
-upload_test_artifacts_instruction: &upload_test_artifacts
+build_and_upload_test_artifacts_instruction: &build_and_upload_test_artifacts
   type: Group
   instructions:
+    - type: ChangeDirectory
+      directory: "{{.SourceDir}}/tests"
+    - *call_cmake
+    - type: ExecuteCommand
+      command: "{{.Env.ENV_PREFIX}} cmake --build ."
+      maxTimeInSeconds: 6000
+      maxTimeBetweenOutput: 120
+      userMessageOnFailure: >
+        Failed to build sources. In the current state bug can be everywhere. Contact Liang first.
     - type: UploadTestArtifact
       transferType: UploadModuleTestsArtifact
       archiveDirectory: "{{.SourceDir}}/tests"
@@ -200,7 +209,7 @@ upload_test_artifacts_instruction: &upload_test_artifacts
   disable_if:
       condition: property
       property: configureArgs
-      in_values: "-DBUILD_SHARED_LIBS=OFF"
+      contains_value: "-DBUILD_SHARED_LIBS=OFF"
 
 regular_specific_test_instructions: &regular_test_instructions
   type: Group
@@ -315,16 +324,7 @@ build_instructions:
     transferType: UploadModuleBuildArtifact
     maxTimeInSeconds: 1200
     maxTimeBetweenOutput: 1200
-  - type: ChangeDirectory
-    directory: "{{.SourceDir}}/tests"
-  - *call_cmake
-  - type: ExecuteCommand
-    command: "{{.Env.ENV_PREFIX}} cmake --build ."
-    maxTimeInSeconds: 6000
-    maxTimeBetweenOutput: 120
-    userMessageOnFailure: >
-      Failed to build sources. In the current state bug can be everywhere. Contact Liang first.
-  - *upload_test_artifacts
+  - *build_and_upload_test_artifacts
 
 test_instructions:
   - *regular_test_instructions