From ecc2976f4bd1c1e880ae72ed6e4f3c33efe21069 Mon Sep 17 00:00:00 2001
From: Klaus Aehlig <klaus.aehlig@huawei.com>
Date: Mon, 8 Jul 2024 14:43:32 +0200
Subject: fix typo

---
 shell/test/EXPRESSIONS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shell/test/EXPRESSIONS b/shell/test/EXPRESSIONS
index f0966f7..635a407 100644
--- a/shell/test/EXPRESSIONS
+++ b/shell/test/EXPRESSIONS
@@ -275,7 +275,7 @@
                 }
               , "then": {"type": "empty_map"}
               , "else":
-                { "type": "singelton_map"
+                { "type": "singleton_map"
                 , "key": "TEST_RUN_NUMBER"
                 , "value": {"type": "var", "name": "ATTEMPT"}
                 }
-- 
cgit v1.2.3


From 85597d2c8d0069c84f982bc16b81e1d612cbb07c Mon Sep 17 00:00:00 2001
From: "Klaus T. Aehlig" <aehlig@linta.de>
Date: Mon, 8 Jul 2024 15:29:03 +0200
Subject: honor toolchain also in summary action

---
 shell/test/RULES | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/shell/test/RULES b/shell/test/RULES
index 4b72d10..91b7637 100644
--- a/shell/test/RULES
+++ b/shell/test/RULES
@@ -114,6 +114,7 @@
     , "stage": ["./", "../..", "stage_singleton_field"]
     , "host transition": ["transitions", "maybe for host"]
     , "target properties": ["transitions", "target properties"]
+    , "default-PATH": ["./", "../../CC", "default-PATH"]
     }
   , "config_transitions":
     { "deps": [{"type": "CALL_EXPRESSION", "name": "host transition"}]
@@ -209,6 +210,12 @@
                 }
               }
             ]
+          , [ "summary PATH"
+            , { "type": "join"
+              , "separator": ":"
+              , "$1": {"type": "CALL_EXPRESSION", "name": "default-PATH"}
+              }
+            ]
           , [ "summary"
             , { "type": "ACTION"
               , "inputs":
@@ -226,6 +233,16 @@
                 , "name": "TEST_SUMMARY_EXECUTION_PROPERTIES"
                 , "default": {"type": "empty_map"}
                 }
+              , "env":
+                { "type": "if"
+                , "cond": {"type": "var", "name": "summary PATH"}
+                , "then":
+                  { "type": "singleton_map"
+                  , "key": "PATH"
+                  , "value": {"type": "var", "name": "summary PATH"}
+                  }
+                , "else": {"type": "empty_map"}
+                }
               }
             ]
           , [ "artifacts"
-- 
cgit v1.2.3


From 5fdfa0f8b7c8c5df54d5ad6ce9e0cc89193cd1bd Mon Sep 17 00:00:00 2001
From: Klaus Aehlig <klaus.aehlig@huawei.com>
Date: Mon, 8 Jul 2024 16:33:58 +0200
Subject: ["CC/test", "test"]: Honor shell-toolchain PATH for summary action

---
 CC/test/EXPRESSIONS | 22 ++++++++++++++++++++++
 CC/test/RULES       |  3 +++
 2 files changed, 25 insertions(+)

diff --git a/CC/test/EXPRESSIONS b/CC/test/EXPRESSIONS
index a10fc2b..fe4918e 100644
--- a/CC/test/EXPRESSIONS
+++ b/CC/test/EXPRESSIONS
@@ -54,6 +54,7 @@
     , "host transition": ["transitions", "for host"]
     , "target properties": ["transitions", "target properties"]
     , "stage": ["./", "../..", "stage_singleton_field"]
+    , "list_provider": ["./", "../..", "field_list_provider"]
     }
   , "expression":
     { "type": "let*"
@@ -276,6 +277,17 @@
                 }
               }
             ]
+          , [ "summary PATH"
+            , { "type": "join"
+              , "separator": ":"
+              , "$1":
+                { "type": "let*"
+                , "bindings":
+                  [["fieldname", "shell-defaults"], ["provider", "PATH"]]
+                , "body": {"type": "CALL_EXPRESSION", "name": "list_provider"}
+                }
+              }
+            ]
           , [ "summary"
             , { "type": "ACTION"
               , "inputs":
@@ -293,6 +305,16 @@
                 , "name": "TEST_SUMMARY_EXECUTION_PROPERTIES"
                 , "default": {"type": "empty_map"}
                 }
+              , "env":
+                { "type": "if"
+                , "cond": {"type": "var", "name": "summary PATH"}
+                , "then":
+                  { "type": "singleton_map"
+                  , "key": "PATH"
+                  , "value": {"type": "var", "name": "summary PATH"}
+                  }
+                , "else": {"type": "empty_map"}
+                }
               }
             ]
           , [ "artifacts"
diff --git a/CC/test/RULES b/CC/test/RULES
index 1dac31b..9f3313d 100644
--- a/CC/test/RULES
+++ b/CC/test/RULES
@@ -34,6 +34,7 @@
     ]
   , "implicit":
     { "defaults": [["./", "..", "defaults"]]
+    , "shell-defaults": [["./", "../../shell", "defaults"]]
     , "runner": ["runner"]
     , "summarizer": [["./", "../../shell/test", "summarizer"]]
     }
@@ -77,6 +78,8 @@
       ]
     , "data": ["Any files the test binary needs access to when running"]
     , "defaults": ["The C/C++ toolchain to use"]
+    , "shell-defaults":
+      ["The shell toolchain to use PATH from for calling the summary action"]
     , "runner":
       [ "The test runner which starts the actual test binary after providing"
       , "the respective environment. The runner also takes care of capturing"
-- 
cgit v1.2.3