diff options
| author | bors <bors@rust-lang.org> | 2023-06-15 22:54:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-06-15 22:54:43 +0000 |
| commit | 0252b4093ff19a8aaae2a1965b76b9ba4528e5c0 (patch) | |
| tree | bbd28a869da0e03dd01081a0ea0b87e3e0af9ed7 /src/ci/docker/scripts | |
| parent | 114fb86ca08cfa6a99087e0f0bc264d03590dc37 (diff) | |
| parent | 05d5449522a4318b740c8acae2f19cc064ba48a8 (diff) | |
| download | rust-0252b4093ff19a8aaae2a1965b76b9ba4528e5c0.tar.gz rust-0252b4093ff19a8aaae2a1965b76b9ba4528e5c0.zip | |
Auto merge of #112681 - GuillaumeGomez:rollup-rwn4086, r=GuillaumeGomez
Rollup of 8 pull requests Successful merges: - #112403 (Prevent `.eh_frame` from being emitted for `-C panic=abort`) - #112517 (`suspicious_double_ref_op`: don't lint on `.borrow()`) - #112529 (Extend `unused_must_use` to cover block exprs) - #112614 (tweak suggestion for argument-position `impl ?Sized`) - #112654 (normalize closure output in equate_inputs_and_outputs) - #112660 (Migrate GUI colors test to original CSS color format) - #112664 (Add support for test tmpdir to fuchsia test runner) - #112669 (Fix comment for ptr alignment checks in codegen) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/ci/docker/scripts')
| -rwxr-xr-x | src/ci/docker/scripts/fuchsia-test-runner.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/ci/docker/scripts/fuchsia-test-runner.py b/src/ci/docker/scripts/fuchsia-test-runner.py index ecef56f56f1..78a8a6662ea 100755 --- a/src/ci/docker/scripts/fuchsia-test-runner.py +++ b/src/ci/docker/scripts/fuchsia-test-runner.py @@ -171,7 +171,6 @@ class TestEnvironment: def home_dir(self): return os.path.join(self.tmp_dir(), "user-home") - def start_ffx_isolation(self): # Most of this is translated directly from ffx's isolate library os.mkdir(self.ffx_isolate_dir()) @@ -424,7 +423,7 @@ class TestEnvironment: ) # Create lockfiles - open(self.pm_lockfile_path(), 'a').close() + open(self.pm_lockfile_path(), "a").close() # Write to file self.write_to_file() @@ -458,6 +457,7 @@ class TestEnvironment: ], use: [ {{ storage: "data", path: "/data" }}, + {{ storage: "tmp", path: "/tmp" }}, {{ protocol: [ "fuchsia.process.Launcher" ] }}, {{ protocol: [ "fuchsia.posix.socket.Provider" ] }} ], @@ -571,6 +571,9 @@ class TestEnvironment: if os.getenv("RUST_BACKTRACE") == None: env_vars += f'\n "RUST_BACKTRACE=0",' + # Use /tmp as the test temporary directory + env_vars += f'\n "RUST_TEST_TMPDIR=/tmp",' + cml.write( self.CML_TEMPLATE.format(env_vars=env_vars, exe_name=exe_name) ) @@ -642,7 +645,7 @@ class TestEnvironment: log("Publishing package to repo...") # Publish package to repo - with open(self.pm_lockfile_path(), 'w') as pm_lockfile: + with open(self.pm_lockfile_path(), "w") as pm_lockfile: fcntl.lockf(pm_lockfile.fileno(), fcntl.LOCK_EX) subprocess.check_call( [ @@ -1045,9 +1048,7 @@ def main(): ) debug_parser.set_defaults(func=debug) - syslog_parser = subparsers.add_parser( - "syslog", help="prints the device syslog" - ) + syslog_parser = subparsers.add_parser("syslog", help="prints the device syslog") syslog_parser.set_defaults(func=syslog) args = parser.parse_args() |
