From befb472b1b9650d485f46ae54227caea8bf81cdd Mon Sep 17 00:00:00 2001
From: Klaus Aehlig <klaus.aehlig@huawei.com>
Date: Wed, 10 Jul 2024 17:25:23 +0200
Subject: Tests: also record `pwd`

... as test meta data. Tests are executed in an unspecified directory,
assuming pass or fail is independent of the location where the test
is run. While this generally is true, test logs often contain the
working directory. So, in order to more easily compare different
execution orders of a potential race condition, it can be desirable
to compare logs "up to the execution directory". This, however,
requires that this directory is recored in the first place. Do so.

For consistency of the output format, also have a (fixed) artifact
pwd in the summary report.
---
 shell/test/EXPRESSIONS | 2 +-
 shell/test/RULES       | 7 ++++++-
 shell/test/runner      | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'shell/test')

diff --git a/shell/test/EXPRESSIONS b/shell/test/EXPRESSIONS
index e158a4c..e445c2a 100644
--- a/shell/test/EXPRESSIONS
+++ b/shell/test/EXPRESSIONS
@@ -172,7 +172,7 @@
       , [ "outs"
         , { "type": "++"
           , "$1":
-            [ ["result", "stdout", "stderr", "time-start", "time-stop"]
+            [ ["result", "stdout", "stderr", "time-start", "time-stop", "pwd"]
             , { "type": "foreach"
               , "var": "filename"
               , "range": {"type": "var", "name": "keep"}
diff --git a/shell/test/RULES b/shell/test/RULES
index af18828..ef67708 100644
--- a/shell/test/RULES
+++ b/shell/test/RULES
@@ -93,6 +93,7 @@
     , "work:   In this directory, all the files specified to \"keep\" are staged"
     , "time-start/time-stop: The time (decimally coded) in seconds since the"
     , "        epoch when the test invocation started and ended."
+    , "pwd:    the directory in which the test was carried out"
     ]
   , "runfiles_doc":
     [ "A tree consisting of the artifacts staged at the name of the test."
@@ -227,7 +228,11 @@
           , [ "artifacts"
             , { "type": "map_union"
               , "$1":
-                [ {"type": "var", "name": "summary"}
+                [ { "type": "singleton_map"
+                  , "key": "pwd"
+                  , "value": {"type": "BLOB", "data": "/summary"}
+                  }
+                , {"type": "var", "name": "summary"}
                 , { "type": "singleton_map"
                   , "key": "work"
                   , "value":
diff --git a/shell/test/runner b/shell/test/runner
index f762355..624610b 100755
--- a/shell/test/runner
+++ b/shell/test/runner
@@ -21,6 +21,7 @@ RESULT=UNKNOWN
 echo "${RESULT}" > result
 echo UNKNOWN > time-start
 echo UNKNOWN > time-stop
+pwd > pwd
 
 mkdir scratch
 export TEST_TMPDIR=$(realpath scratch)
-- 
cgit v1.2.3