OLD | NEW |
1 // Copyright 2014 The Crashpad Authors. All rights reserved. | 1 // Copyright 2014 The Crashpad Authors. All rights reserved. |
2 // | 2 // |
3 // Licensed under the Apache License, Version 2.0 (the "License"); | 3 // Licensed under the Apache License, Version 2.0 (the "License"); |
4 // you may not use this file except in compliance with the License. | 4 // you may not use this file except in compliance with the License. |
5 // You may obtain a copy of the License at | 5 // You may obtain a copy of the License at |
6 // | 6 // |
7 // http://www.apache.org/licenses/LICENSE-2.0 | 7 // http://www.apache.org/licenses/LICENSE-2.0 |
8 // | 8 // |
9 // Unless required by applicable law or agreed to in writing, software | 9 // Unless required by applicable law or agreed to in writing, software |
10 // distributed under the License is distributed on an "AS IS" BASIS, | 10 // distributed under the License is distributed on an "AS IS" BASIS, |
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
211 kExpectedAnnotation) { | 211 kExpectedAnnotation) { |
212 found = true; | 212 found = true; |
213 break; | 213 break; |
214 } | 214 } |
215 } | 215 } |
216 | 216 |
217 EXPECT_TRUE(found) << kExpectedAnnotation; | 217 EXPECT_TRUE(found) << kExpectedAnnotation; |
218 } | 218 } |
219 } | 219 } |
220 | 220 |
221 return ExcServerSuccessfulReturnValue(behavior, false); | 221 ExcServerCopyState( |
| 222 behavior, old_state, old_state_count, new_state, new_state_count); |
| 223 return ExcServerSuccessfulReturnValue(exception, behavior, false); |
222 } | 224 } |
223 | 225 |
224 private: | 226 private: |
225 // MachMultiprocess: | 227 // MachMultiprocess: |
226 | 228 |
227 void MachMultiprocessParent() override { | 229 void MachMultiprocessParent() override { |
228 ProcessReader process_reader; | 230 ProcessReader process_reader; |
229 ASSERT_TRUE(process_reader.Initialize(ChildTask())); | 231 ASSERT_TRUE(process_reader.Initialize(ChildTask())); |
230 | 232 |
231 // Wait for the child process to indicate that it’s done setting up its | 233 // Wait for the child process to indicate that it’s done setting up its |
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
400 | 402 |
401 TEST(MachOImageAnnotationsReader, CrashDyld) { | 403 TEST(MachOImageAnnotationsReader, CrashDyld) { |
402 TestMachOImageAnnotationsReader test_mach_o_image_annotations_reader( | 404 TestMachOImageAnnotationsReader test_mach_o_image_annotations_reader( |
403 TestMachOImageAnnotationsReader::kCrashDyld); | 405 TestMachOImageAnnotationsReader::kCrashDyld); |
404 test_mach_o_image_annotations_reader.Run(); | 406 test_mach_o_image_annotations_reader.Run(); |
405 } | 407 } |
406 | 408 |
407 } // namespace | 409 } // namespace |
408 } // namespace test | 410 } // namespace test |
409 } // namespace crashpad | 411 } // namespace crashpad |
OLD | NEW |