From b20171a41a97dbfd75a98955694eb9df5314ef27 Mon Sep 17 00:00:00 2001
From: "Klaus T. Aehlig" <aehlig@linta.de>
Date: Mon, 5 Feb 2024 11:46:34 +0100
Subject: end-to-end tests: inherit path

... for test actions, by setting an appropriate local launcher. In
this way, the tests can also be run on systems where sh does not
pull in enough paths to have all the "usual" tools available.
---
 test/end-to-end/serve-service/serve_export_deps.sh            | 8 +++++---
 test/end-to-end/serve-service/serve_start_execute_sharding.sh | 6 ++++--
 test/end-to-end/serve-service/serve_target_cache_hit.sh       | 7 +++++--
 3 files changed, 14 insertions(+), 7 deletions(-)

(limited to 'test/end-to-end/serve-service')

diff --git a/test/end-to-end/serve-service/serve_export_deps.sh b/test/end-to-end/serve-service/serve_export_deps.sh
index 64886a4c..e5889505 100644
--- a/test/end-to-end/serve-service/serve_export_deps.sh
+++ b/test/end-to-end/serve-service/serve_export_deps.sh
@@ -84,9 +84,9 @@ EOF
 echo "local repos configuration:"
 cat repos.json
 
-CONF=$("${JUST_MR}" --norc --local-build-root "${SERVE_LBR}" setup)
+CONF=$("${JUST_MR}" -L '["env", "PATH='"${PATH}"'"]' --norc --local-build-root "${SERVE_LBR}" setup)
 cat "${CONF}"
-"${JUST}" build --local-build-root "${SERVE_LBR}" -C "${CONF}" -r ${REMOTE_EXECUTION_ADDRESS} ${COMPAT} main
+"${JUST}" build -L '["env", "PATH='"${PATH}"'"]' --local-build-root "${SERVE_LBR}" -C "${CONF}" -r ${REMOTE_EXECUTION_ADDRESS} ${COMPAT} main
 )
 
 # Set up local repository
@@ -154,15 +154,17 @@ echo
 
 rm "${GENERATOR}"
 
-CONF=$("${JUST_MR}" --norc --local-build-root "${LBR}" ${COMPAT} setup --all)
+CONF=$("${JUST_MR}" -L '["env", "PATH='"${PATH}"'"]' --norc --local-build-root "${LBR}" ${COMPAT} setup --all)
 cat "${CONF}"
 echo
 
 # test that we can successfully compile using just serve
 "${JUST}" build --main local --local-build-root "${LBR}" -C "${CONF}" \
+                -L '["env", "PATH='"${PATH}"'"]' \
                 --remote-serve-address ${SERVE} \
                 -r ${REMOTE_EXECUTION_ADDRESS} ${COMPAT} main
 "${JUST}" build --main local --local-build-root "${LBR}" -C "${CONF}" \
+                -L '["env", "PATH='"${PATH}"'"]' \
                 --remote-serve-address ${SERVE} \
                 -r ${REMOTE_EXECUTION_ADDRESS} ${COMPAT} main
 )
diff --git a/test/end-to-end/serve-service/serve_start_execute_sharding.sh b/test/end-to-end/serve-service/serve_start_execute_sharding.sh
index ff5a4481..d6486841 100644
--- a/test/end-to-end/serve-service/serve_start_execute_sharding.sh
+++ b/test/end-to-end/serve-service/serve_start_execute_sharding.sh
@@ -94,7 +94,7 @@ EOF
 echo "local repos configuration:"
 cat repos.json
 echo
-CONF=$("${JUST_MR}" --norc --local-build-root "${SERVE_LBR}" setup)
+CONF=$("${JUST_MR}" -L '["env", "PATH='"${PATH}"'"]' --norc --local-build-root "${SERVE_LBR}" setup)
 
 echo "generated conf":
 cat "${CONF}"
@@ -102,6 +102,7 @@ echo
 
 "${JUST}" build                         \
     --local-build-root "${SERVE_LBR}"   \
+    -L '["env", "PATH='"${PATH}"'"]'    \
     -C "${CONF}"                        \
     main
 )
@@ -169,13 +170,14 @@ echo "absent repos configuration:"
 cat repos.json
 echo
 
-CONF=$("${JUST_MR}" --norc --local-build-root "${LBR}" setup)
+CONF=$("${JUST_MR}" -L '["env", "PATH='"${PATH}"'"]' --norc --local-build-root "${LBR}" setup)
 cat "${CONF}"
 echo
 
 "${JUST}" build                                \
     --local-build-root "${LBR}"                \
     --remote-serve-address 127.0.0.1:${PORT}   \
+    -L '["env", "PATH='"${PATH}"'"]'    \
     -C "${CONF}"                               \
     main
 )
diff --git a/test/end-to-end/serve-service/serve_target_cache_hit.sh b/test/end-to-end/serve-service/serve_target_cache_hit.sh
index 51ced326..ab20ef07 100644
--- a/test/end-to-end/serve-service/serve_target_cache_hit.sh
+++ b/test/end-to-end/serve-service/serve_target_cache_hit.sh
@@ -99,7 +99,7 @@ EOF
 echo "local repos configuration:"
 cat repos.json
 echo
-CONF=$("${JUST_MR}" --norc --local-build-root "${SERVE_LBR}" setup)
+CONF=$("${JUST_MR}" -L '["env", "PATH='"${PATH}"'"]' --norc --local-build-root "${SERVE_LBR}" setup)
 
 echo "generated conf":
 cat "${CONF}"
@@ -107,6 +107,7 @@ echo
 
 "${JUST}" build                       \
     --local-build-root "${SERVE_LBR}" \
+    -L '["env", "PATH='"${PATH}"'"]'  \
     -C "${CONF}"                      \
     -r "${REMOTE_EXECUTION_ADDRESS}"  \
     ${COMPAT}                         \
@@ -140,7 +141,7 @@ echo
 
 rm "${GENERATOR}"
 
-CONF=$("${JUST_MR}" --norc --local-build-root "${LBR}" setup)
+CONF=$("${JUST_MR}" -L '["env", "PATH='"${PATH}"'"]' --norc --local-build-root "${LBR}" setup)
 cat "${CONF}"
 echo
 # test that it fails without using just serve
@@ -151,6 +152,7 @@ echo "failed as expected"
 # one used by just-serve
 "${JUST}" analyse                     \
     --local-build-root "${LBR}"       \
+    -L '["env", "PATH='"${PATH}"'"]'  \
     --remote-serve-address "${SERVE}" \
     -C "${CONF}"                      \
     -r "${SERVE}"                     \
@@ -162,6 +164,7 @@ echo "failed as expected"
 # test that we can successfully compile using just serve
 "${JUST}" build                       \
     --local-build-root "${LBR}"       \
+    -L '["env", "PATH='"${PATH}"'"]'  \
     --remote-serve-address "${SERVE}" \
     -C "${CONF}"                      \
     -r "${REMOTE_EXECUTION_ADDRESS}"  \
-- 
cgit v1.2.3