Fix exception location in z7 test on older bots

snapshot/win/end_to_end_test.py

 #!/usr/bin/env python
 
 # Copyright 2015 The Crashpad Authors. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
@@ skipping 202 matching lines @@
   # stack entries will not be available. This confirms that we have a mostly
   # valid dump, but that the stack was omitted.
   out.Check(r'self_destroying_program!crashpad::`anonymous namespace\'::'
                 r'FreeOwnStackAndBreak.*\nquit:',
             'at correct location, no additional stack entries')
 
   if z7_dump_path:
     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')
 
 
 def main(args):
   try:
     if len(args) != 1:
       print >>sys.stderr, 'must supply binary dir'
       return 1
 
@@ skipping 30 matching lines @@
     RunTests(cdb_path, crashy_dump_path, destroyed_dump_path, z7_dump_path,
              pipe_name)
 
     return 0
   finally:
     CleanUpTempDirs()
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))