From 1eb2d4d0da121b51832136773f4c863d3e9affc5 Mon Sep 17 00:00:00 2001
From: Dimitrios Apostolou <jimis@qt.io>
Date: Tue, 14 Jun 2022 20:42:45 +0200
Subject: [PATCH] Try to consolidate Unix/Windows libexec directory in coin
 configs

Change-Id: Ie381cb062fc78fe5c291b8d0b49fca5f752c7c30
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 .../cmake_run_ctest_enforce_exit_code.yaml        | 15 ++-------------
 coin/instructions/prepare_building_env.yaml       | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/coin/instructions/cmake_run_ctest_enforce_exit_code.yaml b/coin/instructions/cmake_run_ctest_enforce_exit_code.yaml
index e1e16bca890..ba9b1f3a796 100644
--- a/coin/instructions/cmake_run_ctest_enforce_exit_code.yaml
+++ b/coin/instructions/cmake_run_ctest_enforce_exit_code.yaml
@@ -10,11 +10,7 @@ instructions:
       equals_value: Windows
   - type: EnvironmentVariable
     variableName: TESTRUNNER
-    variableValue: "{{.InstallDir}}/libexec/qt-testrunner.py --"
-    disable_if:
-      condition: property
-      property: host.os
-      equals_value: Windows
+    variableValue: "{{.Env.LIBEXEC_INSTALL_DIR}}qt-testrunner.py --"
   - type: AppendToEnvironmentVariable
     variableName: TESTRUNNER
     variableValue: " {{.SourceDir}}/coin_qnx_qemu_runner.sh"
@@ -22,13 +18,6 @@ instructions:
       condition: property
       property: target.osVersion
       in_values: [QNX_710]
-  - type: EnvironmentVariable
-    variableName: TESTRUNNER
-    variableValue: "{{.InstallDir}}\\bin\\qt-testrunner.py --"
-    enable_if:
-      condition: property
-      property: host.os
-      equals_value: Windows
   - type: Group
     enable_if:
       condition: property
@@ -42,7 +31,7 @@ instructions:
       # Override qt-testrunner as we don't want to gather test statistics
       # because many tests FAIL when built with ASAN.
       variableName: TESTRUNNER
-      variableValue: "{{.InstallDir}}/libexec/sanitizer-testrunner.py"
+      variableValue: "{{.Env.LIBEXEC_INSTALL_DIR}}sanitizer-testrunner.py"
   - type: EnvironmentVariable
     variableName: COIN_CTEST_RESULTSDIR
     variableValue: "{{.AgentWorkingDir}}\\testresults"
diff --git a/coin/instructions/prepare_building_env.yaml b/coin/instructions/prepare_building_env.yaml
index 09b686ec0d1..a94a42c3e26 100644
--- a/coin/instructions/prepare_building_env.yaml
+++ b/coin/instructions/prepare_building_env.yaml
@@ -26,6 +26,20 @@ instructions:
       property: host.os
       equals_value: Windows
 
+  - type: EnvironmentVariable
+    variableName: LIBEXEC_INSTALL_DIR
+    variableValue: "{{.InstallDir}}\\bin\\"
+    enable_if:
+      condition: property
+      property: host.os
+      equals_value: Windows
+  - type: EnvironmentVariable
+    variableName: LIBEXEC_INSTALL_DIR
+    variableValue: "{{.InstallDir}}/libexec/"
+    disable_if:
+      condition: property
+      property: host.os
+      equals_value: Windows
 
   # Export ICC specific env. variables
   - type: Group