From 25b886a7fdbb057e1a425d68d4a13adc9bd9bd36 Mon Sep 17 00:00:00 2001 From: "benchan@chromium.org" Date: Fri, 16 Dec 2011 02:15:11 +0000 Subject: 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 --- src/processor/synth_minidump_unittest.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) { -- cgit v1.2.1