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/git-import/TARGETS           | 13 ++++++++++++-
 test/end-to-end/git-import/chained-import.sh |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

(limited to 'test/end-to-end/git-import')

diff --git a/test/end-to-end/git-import/TARGETS b/test/end-to-end/git-import/TARGETS
index ef379f37..bcf8cf56 100644
--- a/test/end-to-end/git-import/TARGETS
+++ b/test/end-to-end/git-import/TARGETS
@@ -29,7 +29,18 @@
   }
 , "TESTS":
   { "type": "install"
+  , "arguments_config": ["TEST_BOOTSTRAP_JUST_MR"]
   , "tainted": ["test"]
-  , "deps": ["chained-import", "deduplicate"]
+  , "deps":
+    { "type": "++"
+    , "$1":
+      [ ["deduplicate"]
+      , { "type": "if"
+        , "cond": {"type": "var", "name": "TEST_BOOTSTRAP_JUST_MR"}
+        , "then": []
+        , "else": ["chained-import", "deduplicate"]
+        }
+      ]
+    }
   }
 }
diff --git a/test/end-to-end/git-import/chained-import.sh b/test/end-to-end/git-import/chained-import.sh
index e9f98198..b3b2d5b9 100755
--- a/test/end-to-end/git-import/chained-import.sh
+++ b/test/end-to-end/git-import/chained-import.sh
@@ -82,7 +82,7 @@ EOF
 echo
 cat repos.json
 echo
-"${JUST_MR}" --norc --just "${JUST}" --local-build-root "${LBR}" install -o "${OUT}" 2>&1
+"${JUST_MR}" -L '["env", "PATH='"${PATH}"'"]' --norc --just "${JUST}" --local-build-root "${LBR}" install -o "${OUT}" 2>&1
 echo
 cat "${OUT}/out.txt"
 echo
-- 
cgit v1.2.3