Add a switch to allow longer shutdown timeouts, since quitting under valgrind...

tools/valgrind/chrome_tests.py

 #!/usr/bin/python
 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # chrome_tests.py
 
 ''' Runs various chrome tests through valgrind_test.py.
 
 This file is a copy of ../purify/chrome_tests.py. Eventually, it would be nice
@@ skipping 229 matching lines @@
 
   def TestUI(self):
     return self.SimpleTest("chrome", "ui_tests",
                            valgrind_test_args=[
                             "--timeout=120000",
                             "--trace_children",
                             "--indirect"],
                            cmd_args=[
                             "--ui-test-timeout=120000",
                             "--ui-test-action-timeout=80000",
-                            "--ui-test-action-max-timeout=180000"])
+                            "--ui-test-action-max-timeout=180000",
+                            "--ui-test-terminate-timeout=60000"])
 
   def TestLayoutChunk(self, chunk_num, chunk_size):
     # Run tests [chunk_num*chunk_size .. (chunk_num+1)*chunk_size) from the
     # list of tests.  Wrap around to beginning of list at end.
     # If chunk_size is zero, run all tests in the list once.
     # If a text file is given as argument, it is used as the list of tests.
     #
     # Build the ginormous commandline in 'cmd'.
     # It's going to be roughly
     #  python valgrind_test.py ... python run_webkit_tests.py ...
@@ skipping 136 matching lines @@
   for t in options.test:
     tests = ChromeTests(options, args, t)
     ret = tests.Run()
     if ret: return ret
   return 0
 
 
 if __name__ == "__main__":
   ret = _main(sys.argv)
   sys.exit(ret)