mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for test tmpdir to fuchsia test runner

Browse Source 
Also format the script to keep the code nice.
This commit is contained in:
David Koloski 2023-06-15 12:17:40 -04:00
parent 4bd4e2ea82
commit 71db99935a
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ci/docker/scripts/fuchsia-test-runner.py
View File

@ -171,7 +171,6 @@ class TestEnvironment:
def home_dir(self): def home_dir(self):
return os.path.join(self.tmp_dir(), "user-home") return os.path.join(self.tmp_dir(), "user-home")
def start_ffx_isolation(self): def start_ffx_isolation(self):
# Most of this is translated directly from ffx's isolate library # Most of this is translated directly from ffx's isolate library
os.mkdir(self.ffx_isolate_dir()) os.mkdir(self.ffx_isolate_dir())
@ -424,7 +423,7 @@ class TestEnvironment:
) )
# Create lockfiles # Create lockfiles
open(self.pm_lockfile_path(), 'a').close() open(self.pm_lockfile_path(), "a").close()
# Write to file # Write to file
self.write_to_file() self.write_to_file()
@ -458,6 +457,7 @@ class TestEnvironment:
], ],
use: [ use: [
{{ storage: "data", path: "/data" }}, {{ storage: "data", path: "/data" }},
{{ storage: "tmp", path: "/tmp" }},
{{ protocol: [ "fuchsia.process.Launcher" ] }}, {{ protocol: [ "fuchsia.process.Launcher" ] }},
{{ protocol: [ "fuchsia.posix.socket.Provider" ] }} {{ protocol: [ "fuchsia.posix.socket.Provider" ] }}
], ],
@ -571,6 +571,9 @@ class TestEnvironment:
if os.getenv("RUST_BACKTRACE") == None: if os.getenv("RUST_BACKTRACE") == None:
env_vars += f'\n "RUST_BACKTRACE=0",' env_vars += f'\n "RUST_BACKTRACE=0",'
# Use /tmp as the test temporary directory
env_vars += f'\n "RUST_TEST_TMPDIR=/tmp",'
cml.write( cml.write(
self.CML_TEMPLATE.format(env_vars=env_vars, exe_name=exe_name) self.CML_TEMPLATE.format(env_vars=env_vars, exe_name=exe_name)
) )
@ -642,7 +645,7 @@ class TestEnvironment:
log("Publishing package to repo...") log("Publishing package to repo...")
# Publish 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) fcntl.lockf(pm_lockfile.fileno(), fcntl.LOCK_EX)
subprocess.check_call( subprocess.check_call(
[ [
@ -1045,9 +1048,7 @@ def main():
) )
debug_parser.set_defaults(func=debug) debug_parser.set_defaults(func=debug)
syslog_parser = subparsers.add_parser( syslog_parser = subparsers.add_parser("syslog", help="prints the device syslog")
"syslog", help="prints the device syslog"
)
syslog_parser.set_defaults(func=syslog) syslog_parser.set_defaults(func=syslog)
args = parser.parse_args() args = parser.parse_args()