| OLD | NEW | 
|    1 #!/usr/bin/env python |    1 #!/usr/bin/env python | 
|    2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |    2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
|    3 # Use of this source code is governed by a BSD-style license that can be |    3 # Use of this source code is governed by a BSD-style license that can be | 
|    4 # found in the LICENSE file. |    4 # found in the LICENSE file. | 
|    5  |    5  | 
|    6 ''' Runs various chrome tests through valgrind_test.py.''' |    6 ''' Runs various chrome tests through valgrind_test.py.''' | 
|    7  |    7  | 
|    8 import glob |    8 import glob | 
|    9 import logging |    9 import logging | 
|   10 import multiprocessing |   10 import multiprocessing | 
| (...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  446                            cmd_args=[ |  446                            cmd_args=[ | 
|  447                                "--ui-test-action-timeout=60000", |  447                                "--ui-test-action-timeout=60000", | 
|  448                                "--ui-test-action-max-timeout=150000"]) |  448                                "--ui-test-action-max-timeout=150000"]) | 
|  449  |  449  | 
|  450   def TestSkia(self): |  450   def TestSkia(self): | 
|  451     return self.SimpleTest("skia", "skia_unittests") |  451     return self.SimpleTest("skia", "skia_unittests") | 
|  452  |  452  | 
|  453   def TestSql(self): |  453   def TestSql(self): | 
|  454     return self.SimpleTest("chrome", "sql_unittests") |  454     return self.SimpleTest("chrome", "sql_unittests") | 
|  455  |  455  | 
 |  456   def TestSync(self): | 
 |  457     return self.SimpleTest("chrome", "sync_unit_tests") | 
 |  458  | 
|  456   def TestLinuxSandbox(self): |  459   def TestLinuxSandbox(self): | 
|  457     return self.SimpleTest("sandbox", "sandbox_linux_unittests") |  460     return self.SimpleTest("sandbox", "sandbox_linux_unittests") | 
|  458  |  461  | 
|  459   def TestUnit(self): |  462   def TestUnit(self): | 
|  460     # http://crbug.com/51716 |  463     # http://crbug.com/51716 | 
|  461     # Disabling all unit tests |  464     # Disabling all unit tests | 
|  462     # Problems reappeared after r119922 |  465     # Problems reappeared after r119922 | 
|  463     if common.IsMac() and (self._options.valgrind_tool == "memcheck"): |  466     if common.IsMac() and (self._options.valgrind_tool == "memcheck"): | 
|  464       logging.warning("unit_tests are disabled for memcheck on MacOS.") |  467       logging.warning("unit_tests are disabled for memcheck on MacOS.") | 
|  465       return 0; |  468       return 0; | 
| (...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  699     "net": TestNet,              "net_unittests": TestNet, |  702     "net": TestNet,              "net_unittests": TestNet, | 
|  700     "net_perf": TestNetPerf,     "net_perftests": TestNetPerf, |  703     "net_perf": TestNetPerf,     "net_perftests": TestNetPerf, | 
|  701     "phonenumber": TestPhoneNumber, |  704     "phonenumber": TestPhoneNumber, | 
|  702     "libphonenumber_unittests": TestPhoneNumber, |  705     "libphonenumber_unittests": TestPhoneNumber, | 
|  703     "ppapi": TestPPAPI,          "ppapi_unittests": TestPPAPI, |  706     "ppapi": TestPPAPI,          "ppapi_unittests": TestPPAPI, | 
|  704     "printing": TestPrinting,    "printing_unittests": TestPrinting, |  707     "printing": TestPrinting,    "printing_unittests": TestPrinting, | 
|  705     "remoting": TestRemoting,    "remoting_unittests": TestRemoting, |  708     "remoting": TestRemoting,    "remoting_unittests": TestRemoting, | 
|  706     "sandbox": TestLinuxSandbox, "sandbox_linux_unittests": TestLinuxSandbox, |  709     "sandbox": TestLinuxSandbox, "sandbox_linux_unittests": TestLinuxSandbox, | 
|  707     "skia": TestSkia,            "skia_unittests": TestSkia, |  710     "skia": TestSkia,            "skia_unittests": TestSkia, | 
|  708     "sql": TestSql,              "sql_unittests": TestSql, |  711     "sql": TestSql,              "sql_unittests": TestSql, | 
 |  712     "sync": TestSync,            "sync_unit_tests": TestSync, | 
|  709     "sync_integration_tests": TestSyncIntegration, |  713     "sync_integration_tests": TestSyncIntegration, | 
|  710     "sync_integration": TestSyncIntegration, |  714     "sync_integration": TestSyncIntegration, | 
|  711     "ui_base_unit": TestUIBaseUnit,       "ui_base_unittests": TestUIBaseUnit, |  715     "ui_base_unit": TestUIBaseUnit,       "ui_base_unittests": TestUIBaseUnit, | 
|  712     "ui_chromeos": TestUIChromeOS, "ui_chromeos_unittests": TestUIChromeOS, |  716     "ui_chromeos": TestUIChromeOS, "ui_chromeos_unittests": TestUIChromeOS, | 
|  713     "unit": TestUnit,            "unit_tests": TestUnit, |  717     "unit": TestUnit,            "unit_tests": TestUnit, | 
|  714     "url": TestURL,              "url_unittests": TestURL, |  718     "url": TestURL,              "url_unittests": TestURL, | 
|  715     "views": TestViews,          "views_unittests": TestViews, |  719     "views": TestViews,          "views_unittests": TestViews, | 
|  716     "webkit": TestLayout, |  720     "webkit": TestLayout, | 
|  717   } |  721   } | 
|  718  |  722  | 
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  791  |  795  | 
|  792   for t in options.test: |  796   for t in options.test: | 
|  793     tests = ChromeTests(options, args, t) |  797     tests = ChromeTests(options, args, t) | 
|  794     ret = tests.Run() |  798     ret = tests.Run() | 
|  795     if ret: return ret |  799     if ret: return ret | 
|  796   return 0 |  800   return 0 | 
|  797  |  801  | 
|  798  |  802  | 
|  799 if __name__ == "__main__": |  803 if __name__ == "__main__": | 
|  800   sys.exit(_main()) |  804   sys.exit(_main()) | 
| OLD | NEW |