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

linux: put test attachment in temp directory

Browse Source 
This prevents errors creating the attachment if a previous test
failed to delete it for some reason.

Change-Id: I2622d86e08987ad3ff201da84dc9ae210acf776d
Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/2302722
Reviewed-by: Mark Mentovai <mark@chromium.org>
Commit-Queue: Joshua Peraza <jperaza@chromium.org>
This commit is contained in:
Joshua Peraza 2020-07-16 11:30:21 -07:00 committed by Commit Bot
parent 06a688ddc1
commit 9f66d569fb
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
client/crashpad_client_linux_test.cc
View File

@ -313,7 +313,7 @@ CRASHPAD_CHILD_TEST_MAIN(StartHandlerForSelfTestChild) {
test_annotation.Set(kTestAnnotationValue); test_annotation.Set(kTestAnnotationValue);
const std::vector<base::FilePath> attachments = { const std::vector<base::FilePath> attachments = {
base::FilePath(kTestAttachmentName)}; base::FilePath(temp_dir).Append(kTestAttachmentName)};
crashpad::CrashpadClient client; crashpad::CrashpadClient client;
if (!InstallHandler(&client, if (!InstallHandler(&client,
@ -362,16 +362,6 @@ class StartHandlerForSelfInChildTest : public MultiprocessExec {
private: private:
void MultiprocessParent() override { void MultiprocessParent() override {
FileWriter writer;
base::FilePath test_attachment_path = base::FilePath(kTestAttachmentName);
bool is_created = writer.Open(test_attachment_path,
FileWriteMode::kCreateOrFail,
FilePermissions::kOwnerOnly);
ASSERT_TRUE(is_created);
ScopedRemoveFile attachment_remover(test_attachment_path);
writer.Write(kTestAttachmentContent, sizeof(kTestAttachmentContent));
writer.Close();
ScopedTempDir temp_dir; ScopedTempDir temp_dir;
VMSize temp_dir_length = temp_dir.path().value().size(); VMSize temp_dir_length = temp_dir.path().value().size();
ASSERT_TRUE(LoggingWriteFile( ASSERT_TRUE(LoggingWriteFile(
@ -381,6 +371,16 @@ class StartHandlerForSelfInChildTest : public MultiprocessExec {
ASSERT_TRUE( ASSERT_TRUE(
LoggingWriteFile(WritePipeHandle(), &options_, sizeof(options_))); LoggingWriteFile(WritePipeHandle(), &options_, sizeof(options_)));
FileWriter writer;
base::FilePath test_attachment_path =
temp_dir.path().Append(kTestAttachmentName);
bool is_created = writer.Open(test_attachment_path,
FileWriteMode::kCreateOrFail,
FilePermissions::kOwnerOnly);
ASSERT_TRUE(is_created);
writer.Write(kTestAttachmentContent, sizeof(kTestAttachmentContent));
writer.Close();
if (options_.client_uses_signals && !options_.set_first_chance_handler && if (options_.client_uses_signals && !options_.set_first_chance_handler &&
options_.crash_type != CrashType::kSimulated) { options_.crash_type != CrashType::kSimulated) {
// Wait for child's client signal handler. // Wait for child's client signal handler.