From f8c52530f7eedbfa7b106ef457a09005d586d926 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@qt.io>
Date: Tue, 25 Jun 2019 10:02:43 +0200
Subject: Simplify test compilation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We don't need the full cmake invocation as when configuring, instead we
can use the qt-cmake wrapper script that uses the generated toolchain
file.

Change-Id: Ie0d554fbf8543d950112108d6a3f8a7c3a58a6a6
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
---
 coin/module_config.yaml | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/coin/module_config.yaml b/coin/module_config.yaml
index 8881e05d12..ea6600f88d 100644
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@@ -136,6 +136,30 @@ icc_specific_instructions: &icc_export_variables
     property: host.compiler
     equals_value: ICC_18
 
+call_cmake_instructions: &call_cmake
+  type: Group
+  instructions:
+    - type: ExecuteCommand
+      command: "{{.Env.ENV_PREFIX}} {{.InstallDir}}\\bin\\qt-cmake {{.SourceDir}}/tests"
+      maxTimeInSeconds: 6000
+      maxTimeBetweenOutput: 120
+      userMessageOnFailure: >
+        Failed to call cmake. Contact Liang then.
+      enable_if:
+        condition: property
+        property: host.os
+        equals_value: Windows
+    - type: ExecuteCommand
+      command: "{{.InstallDir}}/bin/qt-cmake {{.SourceDir}}/tests"
+      maxTimeInSeconds: 6000
+      maxTimeBetweenOutput: 120
+      userMessageOnFailure: >
+        Failed to call cmake. Contact Liang then.
+      disable_if:
+        condition: property
+        property: host.os
+        equals_value: Windows
+
 build_instructions:
   - type: MakeDirectory
     directory: .git
@@ -225,13 +249,7 @@ build_instructions:
     maxTimeBetweenOutput: 1200
   - type: ChangeDirectory
     directory: "{{.SourceDir}}/tests"
-  - type: ExecuteCommand
-    command: "{{.Env.ENV_PREFIX}} cmake {{.Env.CONFIGURE_ARGS}} -DCMAKE_PREFIX_PATH:PATH={{.InstallDir}} {{.SourceDir}}/tests"
-    executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
-    maxTimeInSeconds: 6000
-    maxTimeBetweenOutput: 120
-    userMessageOnFailure: >
-      Failed to call cmake. Contact Liang then.
+  - *call_cmake
   - type: ExecuteCommand
     command: "{{.Env.ENV_PREFIX}} cmake --build ."
     maxTimeInSeconds: 6000
-- 
cgit v1.2.3