3party/crashpad
0
0
Fork 0
mirror of https://github.com/chromium/crashpad.git synced 2025-01-14 01:08:01 +08:00
Code Issues Projects Releases Wiki Activity

fuchsia: Fix removal of /tmp dir on test run, and location of .so files

Browse Source 
1. .so files should (I believe) be in /pkg/lib according to
https://fuchsia.googlesource.com/docs/+/master/namespaces.md#typical-directory-structure
(None of the tests that load .so actually work currently, so it doesn't
make anything better or worse to fix this.)

2. The test directory structure looks like:
- /tmp/<guid>/pkg/...
- /tmp/<guid>/tmp/...

Previously /tmp/<guid>/pkg/ and /tmp/<guid>/tmp/ were being removed, but
/tmp/<guid>/ wasn't so there was a bunch of empty directory garbage
being left in /tmp. Clean up from the root instead.

Bug: crashpad:196
Change-Id: I4e82198721f329d597e14a89da8bc77fcc8647c6
Reviewed-on: https://chromium-review.googlesource.com/880884
Reviewed-by: Mark Mentovai <mark@chromium.org>
Commit-Queue: Scott Graham <scottmg@chromium.org>
This commit is contained in:
Scott Graham 2018-01-23 10:33:55 -08:00 committed by Commit Bot
parent dea19c7374
commit c9b41a4d15
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
build/run_tests.py
View File

@ -368,8 +368,9 @@ def _RunOnFuchsiaTarget(binary_dir, test, device_name, extra_command_line):
try:
unique_id = uuid.uuid4().hex
tmp_root = '/tmp/%s_%s/tmp' % (test, unique_id)
staging_root = '/tmp/%s_%s/pkg' % (test, unique_id)
test_root = '/tmp/%s_%s' % (test, unique_id)
tmp_root = test_root + '/tmp'
staging_root = test_root + '/pkg'
# Make a staging directory tree on the target.
directories_to_create = [tmp_root, '%s/bin' % staging_root,
@ -378,12 +379,15 @@ def _RunOnFuchsiaTarget(binary_dir, test, device_name, extra_command_line):
def netcp(local_path):
"""Uses `netcp` to copy a file or directory to the device. Files located
inside the build dir are stored to /pkg/bin, otherwise to /pkg/assets.
inside the build dir are stored to /pkg/bin, or /pkg/lib (if .so),
otherwise to /pkg/assets.
"""
in_binary_dir = local_path.startswith(binary_dir + '/')
if in_binary_dir:
target_path = os.path.join(
staging_root, 'bin', local_path[len(binary_dir)+1:])
is_so = local_path.endswith('.so')
target_path = os.path.join(staging_root,
'lib' if is_so else 'bin',
local_path[len(binary_dir)+1:])
else:
target_path = os.path.join(staging_root, 'assets', local_path)
netcp_path = os.path.join(sdk_root, 'tools', 'netcp')
@ -412,7 +416,7 @@ def _RunOnFuchsiaTarget(binary_dir, test, device_name, extra_command_line):
if not success:
raise subprocess.CalledProcessError(1, test)
finally:
netruncmd(['rm', '-rf', tmp_root, staging_root])
netruncmd(['rm', '-rf', test_root])
# This script is primarily used from the waterfall so that the list of tests