win: Implement CrashpadClient::StartHandler()

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 59 matching lines @@
       'Debugging Tools For Windows',)
   for possible_path in possible_paths:
     app_path = os.path.join(possible_path, 'cdb.exe')
     app_path = FindInstalledWindowsApplication(app_path)
     if app_path:
       return app_path
   return None
 
 
 def GetDumpFromProgram(out_dir, pipe_name, executable_name):
-  """Initialize a crash database, run crashpad_handler, run |executable_name|
-  connecting to the crash_handler. Returns the minidump generated by
-  crash_handler for further testing.
+  """Initialize a crash database, and run |executable_name| connecting to a
+  crash handler. If pipe_name is set, crashpad_handler will be started first. If
+  pipe_name is empty, the executable is responsible for starting
+  crashpad_handler. Returns the minidump generated by crashpad_handler for
+  further testing.
   """
   test_database = MakeTempDir()
   handler = None
 
   try:
     if subprocess.call(
         [os.path.join(out_dir, 'crashpad_database_util.exe'), '--create',
          '--database=' + test_database]) != 0:
       print 'could not initialize report database'
       return None
 
-    handler = subprocess.Popen([
-        os.path.join(out_dir, 'crashpad_handler.exe'),
-        '--pipe-name=' + pipe_name,
-        '--database=' + test_database
-    ])
+    if pipe_name:
+      handler = subprocess.Popen([
+          os.path.join(out_dir, 'crashpad_handler.exe'),
+          '--pipe-name=' + pipe_name,
+          '--database=' + test_database
+      ])
 
-    subprocess.call([os.path.join(out_dir, executable_name), pipe_name])
+      subprocess.call([os.path.join(out_dir, executable_name), pipe_name])
+    else:
+      subprocess.call([os.path.join(out_dir, executable_name),
+                       os.path.join(out_dir, 'crashpad_handler.exe'),
+                       test_database])
 
     out = subprocess.check_output([
         os.path.join(out_dir, 'crashpad_database_util.exe'),
         '--database=' + test_database,
         '--show-completed-reports',
         '--show-all-report-info',
     ])
     for line in out.splitlines():
       if line.strip().startswith('Path:'):
         return line.partition(':')[2].strip()
@@ skipping 37 matching lines @@
       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)
 
 
-def RunTests(cdb_path, dump_path, destroyed_dump_path, pipe_name):
+def RunTests(cdb_path,
+             dump_path,
+             start_handler_dump_path,
+             destroyed_dump_path,
+             pipe_name):
   """Runs various tests in sequence. Runs a new cdb instance on the dump for
   each block of tests to reduce the chances that output from one command is
   confused for output from another.
   """
   out = CdbRun(cdb_path, dump_path, '.ecxr')
   out.Check('This dump file has an exception of interest stored in it',
             'captured exception')
   out.Check(
       'crashy_program!crashpad::`anonymous namespace\'::SomeCrashyFunction',
       'exception at correct location')
 
+  out = CdbRun(cdb_path, start_handler_dump_path, '.ecxr')
+  out.Check('This dump file has an exception of interest stored in it',
+            'captured exception (using StartHandler())')
+  out.Check(
+      'crashy_program!crashpad::`anonymous namespace\'::SomeCrashyFunction',
+      'exception at correct location (using StartHandler())')
+
   out = CdbRun(cdb_path, dump_path, '!peb')
   out.Check(r'PEB at', 'found the PEB')
   out.Check(r'Ldr\.InMemoryOrderModuleList:.*\d+ \. \d+', 'PEB_LDR_DATA saved')
   out.Check(r'Base TimeStamp                     Module', 'module list present')
   pipe_name_escaped = pipe_name.replace('\\', '\\\\')
   out.Check(r'CommandLine: *\'.*crashy_program.exe *' + pipe_name_escaped,
             'some PEB data is correct')
   out.Check(r'SystemRoot=C:\\Windows', 'some of environment captured',
             re.IGNORECASE)
 
@@ skipping 51 matching lines @@
           'SRV*' + symbol_dir + '*' +
           protocol + '://msdl.microsoft.com/download/symbols')
 
     pipe_name = r'\\.\pipe\end-to-end_%s_%s' % (
         os.getpid(), str(random.getrandbits(64)))
 
     crashy_dump_path = GetDumpFromCrashyProgram(args[0], pipe_name)
     if not crashy_dump_path:
       return 1
 
+    start_handler_dump_path = GetDumpFromCrashyProgram(args[0], '')

[scottmg, 2015/10/30 23:16:31]

I think None rather than '' would be better.

+    if not start_handler_dump_path:
+      return 1
+
     destroyed_dump_path = GetDumpFromSelfDestroyingProgram(args[0], pipe_name)
     if not destroyed_dump_path:
       return 1
 
-    RunTests(cdb_path, crashy_dump_path, destroyed_dump_path, pipe_name)
+    RunTests(cdb_path,
+             crashy_dump_path,
+             start_handler_dump_path,
+             destroyed_dump_path,
+             pipe_name)
 
     return 0
   finally:
     CleanUpTempDirs()
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))