diff options
| -rw-r--r-- | test/end-to-end/EXPRESSIONS | 1 | ||||
| -rw-r--r-- | test/end-to-end/RULES | 13 | ||||
| -rwxr-xr-x | test/end-to-end/with_remote_test_runner.py | 2 | ||||
| -rwxr-xr-x | test/end-to-end/with_serve_test_runner.py | 2 | ||||
| -rw-r--r-- | test/utils/remote_execution/RULES | 1 | ||||
| -rwxr-xr-x | test/utils/remote_execution/test_runner.py | 2 | ||||
| -rw-r--r-- | test/utils/serve_service/RULES | 1 | ||||
| -rwxr-xr-x | test/utils/serve_service/test_runner.py | 2 |
8 files changed, 22 insertions, 2 deletions
diff --git a/test/end-to-end/EXPRESSIONS b/test/end-to-end/EXPRESSIONS index fe855203..12f0772d 100644 --- a/test/end-to-end/EXPRESSIONS +++ b/test/end-to-end/EXPRESSIONS @@ -68,6 +68,7 @@ , "stderr" , "time-start" , "time-stop" + , "pwd" , "remotestdout" , "remotestderr" ] diff --git a/test/end-to-end/RULES b/test/end-to-end/RULES index 6d0e11cc..ceb6da7c 100644 --- a/test/end-to-end/RULES +++ b/test/end-to-end/RULES @@ -80,6 +80,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." @@ -205,7 +206,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": @@ -483,7 +488,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/test/end-to-end/with_remote_test_runner.py b/test/end-to-end/with_remote_test_runner.py index f4b56105..ea1121bc 100755 --- a/test/end-to-end/with_remote_test_runner.py +++ b/test/end-to-end/with_remote_test_runner.py @@ -41,6 +41,8 @@ def dump_results() -> None: f.write("%s\n" % (stdout, )) with open("stderr", "w") as f: f.write("%s\n" % (stderr, )) + with open("pwd", "w") as f: + f.write("%s\n" % (os.getcwd(), )) def get_remote_execution_address(d: Json) -> str: diff --git a/test/end-to-end/with_serve_test_runner.py b/test/end-to-end/with_serve_test_runner.py index 4cdac21e..f252b36c 100755 --- a/test/end-to-end/with_serve_test_runner.py +++ b/test/end-to-end/with_serve_test_runner.py @@ -42,6 +42,8 @@ def dump_results() -> None: f.write("%s\n" % (stdout, )) with open("stderr", "w") as f: f.write("%s\n" % (stderr, )) + with open("pwd", "w") as f: + f.write("%s\n" % (os.getcwd(), )) def run_cmd(cmd: List[str], diff --git a/test/utils/remote_execution/RULES b/test/utils/remote_execution/RULES index 290b04d2..02f2272d 100644 --- a/test/utils/remote_execution/RULES +++ b/test/utils/remote_execution/RULES @@ -102,6 +102,7 @@ , " the respective file descriptor" , "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." diff --git a/test/utils/remote_execution/test_runner.py b/test/utils/remote_execution/test_runner.py index c1dfae95..30088807 100755 --- a/test/utils/remote_execution/test_runner.py +++ b/test/utils/remote_execution/test_runner.py @@ -36,6 +36,8 @@ def dump_results() -> None: f.write("%s\n" % (stdout, )) with open("stderr", "w") as f: f.write("%s\n" % (stderr, )) + with open("pwd", "w") as f: + f.write("%s\n" % (os.getcwd(), )) dump_results() diff --git a/test/utils/serve_service/RULES b/test/utils/serve_service/RULES index 5b492b6a..6fe4b55f 100644 --- a/test/utils/serve_service/RULES +++ b/test/utils/serve_service/RULES @@ -103,6 +103,7 @@ , " the respective file descriptor" , "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." diff --git a/test/utils/serve_service/test_runner.py b/test/utils/serve_service/test_runner.py index df56ce1c..80afec2b 100755 --- a/test/utils/serve_service/test_runner.py +++ b/test/utils/serve_service/test_runner.py @@ -36,6 +36,8 @@ def dump_results() -> None: f.write("%s\n" % (stdout, )) with open("stderr", "w") as f: f.write("%s\n" % (stderr, )) + with open("pwd", "w") as f: + f.write("%s\n" % (os.getcwd(), )) dump_results() |