fuchsia: Package test cert and key when running in Fuchsia tree

Bug: crashpad:196
Change-Id: I18f7686a9b5127143501c2b21663d80aae3d1f54
Reviewed-on: https://chromium-review.googlesource.com/1100494
Commit-Queue: Scott Graham <scottmg@chromium.org>
Reviewed-by: Scott Graham <scottmg@chromium.org>
This commit is contained in:
Scott Graham 2018-06-13 20:14:43 -07:00 committed by Commit Bot
parent 0a665e3c81
commit 2771ebf805
2 changed files with 20 additions and 0 deletions

View File

@ -45,6 +45,7 @@ if (crashpad_is_in_chromium || crashpad_is_in_fuchsia) {
"snapshot:crashpad_snapshot_test_module_large",
"snapshot:crashpad_snapshot_test_module_small",
"test:crashpad_test_test_multiprocess_exec_test_child",
"util:generate_test_server_key",
"util:http_transport_test_server",
]
@ -60,6 +61,17 @@ if (crashpad_is_in_chromium || crashpad_is_in_fuchsia) {
name = "http_transport_test_server"
dest = "crashpad_test_data/http_transport_test_server"
},
# These aren't actually tests, but that seems to be the only way to
# convince package() to get them from the output directory.
{
name = "crashpad_util_test_cert.pem"
dest = "crashpad_test_data/crashpad_util_test_cert.pem"
},
{
name = "crashpad_util_test_key.pem"
dest = "crashpad_test_data/crashpad_util_test_key.pem"
},
]
loadable_modules = [

View File

@ -232,6 +232,14 @@ base::FilePath TestPaths::BuildArtifact(
break;
case FileType::kCertificate:
#if defined(CRASHPAD_IS_IN_FUCHSIA)
// When running in the Fuchsia tree, the .pem files are packaged as assets
// into the test data folder. This will need to be rationalized when
// things are actually run from a package.
// https://crashpad.chromium.org/bug/196.
directory =
base::FilePath(FILE_PATH_LITERAL("/system/test/crashpad_test_data"));
#endif
extension = FILE_PATH_LITERAL(".pem");
break;
}