test runners: Rules in tests should isolate staged artifacts

...that come with installing just. This ensures control on the
subdirectories available to the runner, avoiding any possible
conflicting paths.

7 files changed, 17 insertions, 8 deletions

diff --git a/test/end-to-end/EXPRESSIONS b/test/end-to-end/EXPRESSIONS
index 711b1d94..fe855203 100644
--- a/test/end-to-end/EXPRESSIONS
+++ b/test/end-to-end/EXPRESSIONS
@@ -97,7 +97,10 @@
               , "key": "work"
               , "value": {"type": "var", "name": "deps"}
               }
-            , {"type": "var", "name": "just"}
+            , { "type": "to_subdir"
+              , "subdir": "staged"
+              , "$1": {"type": "var", "name": "just"}
+              }
             , {"type": "var", "name": "runner"}
             , {"type": "var", "name": "test.sh"}
             , {"type": "var", "name": "data"}
diff --git a/test/end-to-end/with_remote_test_runner.py b/test/end-to-end/with_remote_test_runner.py
index 079f627b..f4b56105 100755
--- a/test/end-to-end/with_remote_test_runner.py
+++ b/test/end-to-end/with_remote_test_runner.py
@@ -80,7 +80,7 @@ if not custom_remote:
     ).stdout.decode('utf-8')
 
     remote_cmd = [
-        "./bin/just",
+        "./staged/bin/just",
         "execute",
         "-L",
         json.dumps(["env", "PATH=" + PATH]),
diff --git a/test/end-to-end/with_serve_test_runner.py b/test/end-to-end/with_serve_test_runner.py
index a7e7861b..4cdac21e 100755
--- a/test/end-to-end/with_serve_test_runner.py
+++ b/test/end-to-end/with_serve_test_runner.py
@@ -96,7 +96,7 @@ if not standalone_serve:
         os.remove(REMOTE_INFO)
 
     remote_cmd = [
-        "./bin/just",
+        "./staged/bin/just",
         "execute",
         "-L",
         json.dumps(["env", "PATH=" + PATH]),
@@ -248,7 +248,7 @@ with open(SERVE_CONFIG_FILE, "w") as f:
 servestdout = open("servestdout", "w")
 servestderr = open("servestderr", "w")
 serve_proc = subprocess.Popen(
-    ["./bin/just", "serve", SERVE_CONFIG_FILE],
+    ["./staged/bin/just", "serve", SERVE_CONFIG_FILE],
     stdout=servestdout,
     stderr=servestderr,
 )
diff --git a/test/utils/remote_execution/RULES b/test/utils/remote_execution/RULES
index f776bddb..710daa84 100644
--- a/test/utils/remote_execution/RULES
+++ b/test/utils/remote_execution/RULES
@@ -187,7 +187,10 @@
         , { "type": "map_union"
           , "$1":
             [ {"type": "var", "name": "compatible-remote"}
-            , {"type": "var", "name": "just"}
+            , { "type": "to_subdir"
+              , "subdir": "staged"
+              , "$1": {"type": "var", "name": "just"}
+              }
             ]
           }
         ]
diff --git a/test/utils/remote_execution/test_runner.py b/test/utils/remote_execution/test_runner.py
index fb3e50ab..c1dfae95 100755
--- a/test/utils/remote_execution/test_runner.py
+++ b/test/utils/remote_execution/test_runner.py
@@ -62,7 +62,7 @@ PATH = subprocess.run(
 ).stdout.decode('utf-8')
 
 remote_cmd = [
-    "./bin/just",
+    "./staged/bin/just",
     "execute",
     "-L",
     json.dumps(["env", "PATH=" + PATH]),
diff --git a/test/utils/serve_service/RULES b/test/utils/serve_service/RULES
index a59aa974..406a84f5 100644
--- a/test/utils/serve_service/RULES
+++ b/test/utils/serve_service/RULES
@@ -188,7 +188,10 @@
         , { "type": "map_union"
           , "$1":
             [ {"type": "var", "name": "compatible-remote"}
-            , {"type": "var", "name": "just"}
+            , { "type": "to_subdir"
+              , "subdir": "staged"
+              , "$1": {"type": "var", "name": "just"}
+              }
             ]
           }
         ]
diff --git a/test/utils/serve_service/test_runner.py b/test/utils/serve_service/test_runner.py
index 3b6c4fdc..df56ce1c 100755
--- a/test/utils/serve_service/test_runner.py
+++ b/test/utils/serve_service/test_runner.py
@@ -113,7 +113,7 @@ with open(SERVE_CONFIG_FILE, "w") as f:
             }
         }))
 
-serve_cmd = ["./bin/just", "serve", SERVE_CONFIG_FILE]
+serve_cmd = ["./staged/bin/just", "serve", SERVE_CONFIG_FILE]
 
 servestdout = open("servestdout", "w")
 servestderr = open("servestderr", "w")