Fix exception location in z7 test on older bots

The cdb on the x86 bot displays relative to exported DLL symbols, but
newer ones don't seem to, so it's either:

  z7_test!CrashMe+0xe

or

  z7_test+0x100e

https://build.chromium.org/p/client.crashpad/builders/crashpad_win_x86_rel/builds/110/steps/run%20tests/logs/stdio

R=mark@chromium.org
BUG=crashpad:47

Review URL: https://codereview.chromium.org/1430633006 .
This commit is contained in:
Scott Graham 2015-11-02 10:28:01 -08:00
parent 3e4130ad5d
commit c295e9d748

View File

@ -221,7 +221,10 @@ def RunTests(cdb_path, dump_path, destroyed_dump_path, z7_dump_path, pipe_name):
out = CdbRun(cdb_path, z7_dump_path, '.ecxr;lm')
out.Check('This dump file has an exception of interest stored in it',
'captured exception in z7 module')
out.Check(r'z7_test\+0x[0-8a-f]+:', 'exception in z7 at correct location')
# Older versions of cdb display relative to exports for /Z7 modules, newer
# ones just display the offset.
out.Check(r'z7_test(!CrashMe\+0xe|\+0x100e):',
'exception in z7 at correct location')
out.Check(r'z7_test C \(codeview symbols\) z7_test.dll',
'expected non-pdb symbol format')