Update Crashpad to b47bf6c250c6b825dee1c5fbad9152c2c962e828

third_party/crashpad/crashpad/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
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
 import os
 import platform
 import random
 import re
 import subprocess
 import sys
 import tempfile
 import time
 
 
 g_temp_dirs = []
+g_had_failures = False
 
 
 def MakeTempDir():
   global g_temp_dirs
   new_dir = tempfile.mkdtemp()
   g_temp_dirs.append(new_dir)
   return new_dir
 
 
 def CleanUpTempDirs():
@@ skipping 136 matching lines @@
       sys.stdout.flush()
     else:
       print >>sys.stderr, '-' * 80
       print >>sys.stderr, 'FAILED - %s' % message
       print >>sys.stderr, '-' * 80
       print >>sys.stderr, 'did not match:\n  %s' % pattern
       print >>sys.stderr, '-' * 80
       print >>sys.stderr, 'remaining output was:\n  %s' % self.out
       print >>sys.stderr, '-' * 80
       sys.stderr.flush()
-      sys.exit(1)
+      global g_had_failures
+      g_had_failures = True
+
+  def Find(self, pattern, re_flags=0):
+    match_obj = re.search(pattern, self.out, re_flags)
+    if match_obj:
+      # Matched. Consume up to end of match.
+      self.out = self.out[match_obj.end(0):]
+      return match_obj
+    return None
 
 
 def RunTests(cdb_path,
              dump_path,
              start_handler_dump_path,
              destroyed_dump_path,
              z7_dump_path,
              other_program_path,
              other_program_no_exception_path,
              pipe_name):
@@ skipping 63 matching lines @@
   out.Check(r'ntdll\.dll', 'ntdll present', re.IGNORECASE)
 
   # Check that there is no stack trace in the self-destroyed process. Confirm
   # that the top is where we expect it (that's based only on IP), but subsequent
   # 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')
 
-  # Switch to the other thread after jumping to the exception, and examine
-  # memory.
-  out = CdbRun(cdb_path, dump_path, '.ecxr; ~1s; db /c14 edi')
+  # Dump memory pointed to be EDI on the background suspended thread. We don't
+  # know the index of the thread because the system may have started other
+  # threads, so first do a run to extract the thread index that's suspended, and
+  # then another run to dump the data pointed to by EDI for that thread.
+  out = CdbRun(cdb_path, dump_path, '.ecxr;~')
+  match_obj = out.Find(r'(\d+)\s+Id: [0-9a-f.]+ Suspend: 1 Teb:')
+  if match_obj:
+    thread = match_obj.group(1)
+    out = CdbRun(cdb_path, dump_path, '.ecxr;~' + thread + 's;db /c14 edi')
   out.Check(r'63 62 61 60 5f 5e 5d 5c-5b 5a 59 58 57 56 55 54 53 52 51 50',
             'data pointed to by registers captured')
 
   # Move up one stack frame after jumping to the exception, and examine memory.
   out = CdbRun(cdb_path, dump_path,
                '.ecxr; .f+; dd /c100 poi(offset_pointer)-20')
   out.Check(r'80000078 00000079 8000007a 0000007b 8000007c 0000007d 8000007e '
             r'0000007f 80000080 00000081 80000082 00000083 80000084 00000085 '
             r'80000086 00000087 80000088 00000089 8000008a 0000008b 8000008c '
             r'0000008d 8000008e 0000008f 80000090 00000091 80000092 00000093 '
@@ skipping 40 matching lines @@
     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')
 
   out = CdbRun(cdb_path, other_program_path, '.ecxr;k;~')
   out.Check('Unknown exception - code deadbea7',
             'other program dump exception code')
   out.Check('!Sleep', 'other program reasonable location')
   out.Check('hanging_program!Thread1', 'other program dump right thread')
-  out.Check('\.  1  Id.*Suspend: 0 ',
-            'other program exception on correct thread and correct suspend')
-  out.Check('   4  Id.*Suspend: 0 ',
-            'other program injection thread correct suspend')
+  count = 0
+  while True:
+    match_obj = out.Find(r'Id.*Suspend: (\d+) ')
+    if match_obj:
+      if match_obj.group(1) != '0':
+        out.Check(r'FAILED', 'all suspend counts should be 0')
+      else:
+        count += 1
+    else:
+      break
+  assert count > 2
 
   out = CdbRun(cdb_path, other_program_no_exception_path, '.ecxr;k')
   out.Check('Unknown exception - code 0cca11ed',
             'other program with no exception given')
   out.Check('!RaiseException', 'other program in RaiseException()')
 
 
 def main(args):
   try:
     if len(args) != 1:
@@ skipping 45 matching lines @@
 
     RunTests(cdb_path,
              crashy_dump_path,
              start_handler_dump_path,
              destroyed_dump_path,
              z7_dump_path,
              other_program_path,
              other_program_no_exception_path,
              pipe_name)
 
-    return 0
+    return 1 if g_had_failures else 0
   finally:
     CleanUpTempDirs()
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))