3party/crashpad
0
0
Fork 0
mirror of https://github.com/chromium/crashpad.git synced 2025-03-09 14:06:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fuchsia: When in Fuchsia, move helper binaries to subdir

Browse Source 
In my ongoing quest to break the Fuchsia tree in as many ways as
possible...

All binaries found in /system/test are automatically run. So when
http_transport_test_server and
crashpad_test_test_multiprocess_exec_test_child are unexpectedly run
they just hang, breaking the overall test run. To avoid this, package
them into a subdirectory which is the preferred solution.

Bug: crashpad:196
Change-Id: If79c2c8c5493214fddbb2fa6de6f69ee0c78d9bd
Reviewed-on: https://chromium-review.googlesource.com/1054782
Reviewed-by: Joshua Peraza <jperaza@chromium.org>
Commit-Queue: Scott Graham <scottmg@chromium.org>
This commit is contained in:
Scott Graham 2018-05-10 16:51:14 -07:00 committed by Commit Bot
parent 19e6087bb2
commit 95a052dc0d
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BUILD.gn
View File

@ -54,9 +54,11 @@ if (crashpad_is_in_chromium || crashpad_is_in_fuchsia) {
},
{
name = "crashpad_test_test_multiprocess_exec_test_child"
dest = "crashpad_test_data/crashpad_test_test_multiprocess_exec_test_child"
},
{
name = "http_transport_test_server"
dest = "crashpad_test_data/http_transport_test_server"
},
]

5
test/test_paths.cc
View File

@ -133,7 +133,7 @@ base::FilePath TestPaths::Executable() {
// not appear as expected at /pkg/bin. Override the default of /pkg/bin/app
// so that tests can find the correct location for now.
// https://crashpad.chromium.org/bug/196.
executable_path = base::FilePath("/system/test/app");
executable_path = base::FilePath("/system/test/crashpad_test_data/app");
#endif
return executable_path;
}
@ -207,7 +207,8 @@ base::FilePath TestPaths::BuildArtifact(
// binaries do not appear as expected at /pkg/bin. Override the default of
// /pkg/bin/app so that tests can find the correct location for now.
// https://crashpad.chromium.org/bug/196.
directory = base::FilePath(FILE_PATH_LITERAL("/system/test"));
directory =
base::FilePath(FILE_PATH_LITERAL("/system/test/crashpad_test_data"));
#else
directory = base::FilePath(FILE_PATH_LITERAL("/pkg/bin"));
#endif