Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for test tmpdir to fuchsia test runner #112664

Merged
merged 1 commit into from
Jun 16, 2023
Merged

Add support for test tmpdir to fuchsia test runner #112664

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/ci/docker/scripts/fuchsia-test-runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,6 @@ def ffx_isolate_dir(self):
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())
Expand Down Expand Up @@ -424,7 +423,7 @@ def start(self):
)

# Create lockfiles
open(self.pm_lockfile_path(), 'a').close()
open(self.pm_lockfile_path(), "a").close()

# Write to file
self.write_to_file()
Expand Down Expand Up @@ -458,6 +457,7 @@ def start(self):
],
use: [
{{ storage: "data", path: "/data" }},
{{ storage: "tmp", path: "/tmp" }},
{{ protocol: [ "fuchsia.process.Launcher" ] }},
{{ protocol: [ "fuchsia.posix.socket.Provider" ] }}
],
Expand Down Expand Up @@ -571,6 +571,9 @@ def log(msg):
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)
)
Expand Down Expand Up @@ -642,7 +645,7 @@ def log(msg):
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(
[
Expand Down Expand Up @@ -1045,9 +1048,7 @@ def print_help(args):
)
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()
Expand Down