diff options
| author | benchan@chromium.org <benchan@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2011-12-16 02:15:11 +0000 |
|---|---|---|
| committer | benchan@chromium.org <benchan@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2011-12-16 02:15:11 +0000 |
| commit | 25b886a7fdbb057e1a425d68d4a13adc9bd9bd36 (patch) | |
| tree | 9a73127de727986b7c5d6e46b2d184a3069c62d7 /src/processor/synth_minidump_unittest.cc | |
| parent | Add API on iOS to generate dump on demand. (diff) | |
| download | breakpad-25b886a7fdbb057e1a425d68d4a13adc9bd9bd36.tar.xz | |
Fix ContextDeathTest.X86BadFlags unit test on Mac OS X.
The assertion (context.context_flags & MD_CONTEXT_X86) in synth_minidump.cc
produces a different message on Mac OS X than other platforms. This patch
changes the ContextDeathTest.X86BadFlags test to handle both message patterns.
BUG=424
TEST=Verified ContextDeathTest.X86BadFlags on Windows, Linux and Mac OS X.
Review URL: http://breakpad.appspot.com/333001
git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@894 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'src/processor/synth_minidump_unittest.cc')
| -rw-r--r-- | src/processor/synth_minidump_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/processor/synth_minidump_unittest.cc b/src/processor/synth_minidump_unittest.cc index b5ae3357..1ce34ddf 100644 --- a/src/processor/synth_minidump_unittest.cc +++ b/src/processor/synth_minidump_unittest.cc @@ -150,7 +150,7 @@ TEST(ContextDeathTest, X86BadFlags) { MDRawContextX86 raw; raw.context_flags = 0; ASSERT_DEATH(Context context(dump, raw);, - "context\\.context_flags & 0x[0-9a-f]+"); + "context\\.context_flags & (0x[0-9a-f]+|MD_CONTEXT_X86)"); } TEST(ContextDeathTest, X86BadEndianness) { |