1 files changed, 84 insertions, 2 deletions
diff --git a/shell/test/EXPRESSIONS b/shell/test/EXPRESSIONS
index c4e0a3c..9791911 100644
--- a/shell/test/EXPRESSIONS
+++ b/shell/test/EXPRESSIONS
@@ -15,11 +15,13 @@
   , "imports":
     { "artifacts_list": ["./", "../..", "field_artifacts_list"]
     , "runfiles_list": ["./", "../..", "field_runfiles_list"]
+    , "map_provider": ["./", "../..", "field_map_provider"]
     , "default-TOOLCHAIN": ["./", "../../CC", "default-TOOLCHAIN"]
     , "default-NON_SYSTEM_TOOLS":
       ["./", "../../CC", "default-NON_SYSTEM_TOOLS"]
     , "default-PATH": ["./", "../../CC", "default-PATH"]
     , "default-sh": ["./", "..", "default-sh"]
+    , "sh prolog": ["shell", "prolog"]
     }
   , "expression":
     { "type": "let*"
@@ -59,6 +61,20 @@
       , [ "NON_SYSTEM_TOOLS"
         , {"type": "CALL_EXPRESSION", "name": "default-NON_SYSTEM_TOOLS"}
         ]
+      , [ "sh from outside"
+        , { "type": "if"
+          , "cond":
+            { "type": "lookup"
+            , "key": "sh"
+            , "map": {"type": "var", "name": "NON_SYSTEM_TOOLS"}
+            }
+          , "then":
+            { "type": "join"
+            , "$1": ["./toolchain/", {"type": "var", "name": "sh"}]
+            }
+          , "else": {"type": "var", "name": "sh"}
+          }
+        ]
       , [ "sh from workdir"
         , { "type": "if"
           , "cond":
@@ -73,6 +89,36 @@
           , "else": {"type": "var", "name": "sh"}
           }
         ]
+      , [ "with-env"
+        , { "type": "singleton_map"
+          , "key": "with-env"
+          , "value":
+            { "type": "BLOB"
+            , "data":
+              { "type": "join"
+              , "separator": "\n"
+              , "$1":
+                { "type": "++"
+                , "$1":
+                  [ { "type": "let*"
+                    , "bindings": [["fieldname", "defaults"]]
+                    , "body": {"type": "CALL_EXPRESSION", "name": "sh prolog"}
+                    }
+                  , [ ""
+                    , { "type": "join_cmd"
+                      , "$1":
+                        { "type": "++"
+                        , "$1": [["./runner"], {"type": "var", "name": "keep"}]
+                        }
+                      }
+                    , ""
+                    ]
+                  ]
+                }
+              }
+            }
+          }
+        ]
       , [ "invocation cmd"
         , [{"type": "var", "name": "sh from workdir"}, "../test.sh"]
         ]
@@ -154,6 +200,19 @@
             }
           }
         ]
+      , [ "run-libs"
+        , { "type": "TREE"
+          , "$1":
+            { "type": "let*"
+            , "bindings":
+              [ ["fieldname", {"type": "var", "name": "deps-fieldname"}]
+              , ["provider", "run-libs"]
+              , ["transition", {"type": "var", "name": "deps-transition"}]
+              ]
+            , "body": {"type": "CALL_EXPRESSION", "name": "map_provider"}
+            }
+          }
+        ]
       , [ "attempt marker"
         , { "type": "if"
           , "cond":
@@ -202,7 +261,12 @@
               , "key": "work"
               , "value": {"type": "var", "name": "deps"}
               }
+            , { "type": "singleton_map"
+              , "key": "libs"
+              , "value": {"type": "var", "name": "run-libs"}
+              }
             , {"type": "var", "name": "toolchain"}
+            , {"type": "var", "name": "with-env"}
             , {"type": "var", "name": "runner"}
             , {"type": "var", "name": "invocation"}
             , {"type": "var", "name": "test.sh"}
@@ -210,8 +274,26 @@
             ]
           }
         ]
-      , [ "cmd"
-        , {"type": "++", "$1": [["./runner"], {"type": "var", "name": "keep"}]}
+      , ["cmd", [{"type": "var", "name": "sh from outside"}, "with-env"]]
+      , [ "test_env"
+        , { "type": "map_union"
+          , "$1":
+            [ { "type": "if"
+              , "cond":
+                { "type": "=="
+                , "$1": {"type": "var", "name": "ATTEMPT"}
+                , "$2": null
+                }
+              , "then": {"type": "empty_map"}
+              , "else":
+                { "type": "singleton_map"
+                , "key": "TEST_RUN_NUMBER"
+                , "value": {"type": "var", "name": "ATTEMPT"}
+                }
+              }
+            , {"type": "var", "name": "test_env"}
+            ]
+          }
         ]
       ]
     , "body":