Try to consolidate Unix/Windows libexec directory in coin configs

Change-Id: Ie381cb062fc78fe5c291b8d0b49fca5f752c7c30 Reviewed-by: Alexandru Croitor <[email protected]>
HoBoIs · Jun 15, 2022 · 1eb2d4d · 1eb2d4d
1 parent fe0e87c
commit 1eb2d4d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/coin/instructions/cmake_run_ctest_enforce_exit_code.yaml b/coin/instructions/cmake_run_ctest_enforce_exit_code.yaml
@@ -10,25 +10,14 @@ 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"
     enable_if:
       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
@@ -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