diff options
| -rw-r--r-- | test/end-to-end/RULES | 6 | ||||
| -rwxr-xr-x | test/end-to-end/with_serve_test_runner.py | 14 |
2 files changed, 12 insertions, 8 deletions
diff --git a/test/end-to-end/RULES b/test/end-to-end/RULES index 13efd588..a1954ac4 100644 --- a/test/end-to-end/RULES +++ b/test/end-to-end/RULES @@ -223,8 +223,10 @@ , "" , "An empty directory is created to store any temporary files needed" , "by the test, and it is made available in the environment variable" - , "TEST_TMPDIR. The test should not assume write permissions" - , "outside the working directory and the TEST_TMPDIR." + , "TEST_TMPDIR. Also, the serve server build root is being made available" + , "in the environment variable SERVE_LBR. The test should not assume" + , "write permissions outside the working directory, the TEST_TMPDIR, and" + , "the SERVE_LBR." , "For convenience, the environment variable TMPDIR is also set to TEST_TMPDIR." ] , "name": diff --git a/test/end-to-end/with_serve_test_runner.py b/test/end-to-end/with_serve_test_runner.py index 15490d9f..2782b7ed 100755 --- a/test/end-to-end/with_serve_test_runner.py +++ b/test/end-to-end/with_serve_test_runner.py @@ -210,12 +210,14 @@ SERVE_ADDRESS = get_remote_execution_address(serve_info) # run the actual test -ENV = dict(os.environ, - TEST_TMPDIR=TEMP_DIR, - TMPDIR=TEMP_DIR, - REMOTE_EXECUTION_ADDRESS=g_REMOTE_EXECUTION_ADDRESS, - SERVE=SERVE_ADDRESS, - **repos_env) +ENV = dict( + os.environ, + TEST_TMPDIR=TEMP_DIR, + TMPDIR=TEMP_DIR, + REMOTE_EXECUTION_ADDRESS=g_REMOTE_EXECUTION_ADDRESS, + SERVE=SERVE_ADDRESS, + SERVE_LBR=SERVE_LBR, # expose the serve build root to the test env + **repos_env) if "COMPATIBLE" in ENV: del ENV["COMPATIBLE"] |