| 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 optparse | 10 import optparse | 
| (...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 244 | 244 | 
| 245   def TestCrypto(self): | 245   def TestCrypto(self): | 
| 246     return self.SimpleTest("crypto", "crypto_unittests") | 246     return self.SimpleTest("crypto", "crypto_unittests") | 
| 247 | 247 | 
| 248   def TestFFmpeg(self): | 248   def TestFFmpeg(self): | 
| 249     return self.SimpleTest("chrome", "ffmpeg_unittests") | 249     return self.SimpleTest("chrome", "ffmpeg_unittests") | 
| 250 | 250 | 
| 251   def TestFFmpegRegressions(self): | 251   def TestFFmpegRegressions(self): | 
| 252     return self.SimpleTest("chrome", "ffmpeg_regression_tests") | 252     return self.SimpleTest("chrome", "ffmpeg_regression_tests") | 
| 253 | 253 | 
| 254   def TestGfx(self): |  | 
| 255     # Run ui_unittests, a successor of gfx_unittests, since gfx_unittests is |  | 
| 256     # deprecated. |  | 
| 257     # TODO(hbono): This is a band-aid fix. We need to change the master script |  | 
| 258     # so our bots run ui_unittests. |  | 
| 259     return self.SimpleTest("chrome", "ui_unittests") |  | 
| 260 |  | 
| 261   def TestGPU(self): | 254   def TestGPU(self): | 
| 262     return self.SimpleTest("gpu", "gpu_unittests") | 255     return self.SimpleTest("gpu", "gpu_unittests") | 
| 263 | 256 | 
| 264   def TestGURL(self): | 257   def TestGURL(self): | 
| 265     return self.SimpleTest("chrome", "googleurl_unittests") | 258     return self.SimpleTest("chrome", "googleurl_unittests") | 
| 266 | 259 | 
| 267   def TestIpc(self): | 260   def TestIpc(self): | 
| 268     return self.SimpleTest("ipc", "ipc_tests", | 261     return self.SimpleTest("ipc", "ipc_tests", | 
| 269                            valgrind_test_args=["--trace_children"]) | 262                            valgrind_test_args=["--trace_children"]) | 
| 270 | 263 | 
| (...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 503     "remoting": TestRemoting,    "remoting_unittests": TestRemoting, | 496     "remoting": TestRemoting,    "remoting_unittests": TestRemoting, | 
| 504     "safe_browsing": TestSafeBrowsing, "safe_browsing_tests": TestSafeBrowsing, | 497     "safe_browsing": TestSafeBrowsing, "safe_browsing_tests": TestSafeBrowsing, | 
| 505     "sql": TestSql,              "sql_unittests": TestSql, | 498     "sql": TestSql,              "sql_unittests": TestSql, | 
| 506     "sync": TestSync,            "sync_unit_tests": TestSync, | 499     "sync": TestSync,            "sync_unit_tests": TestSync, | 
| 507     "sync_integration_tests": TestSyncIntegration, | 500     "sync_integration_tests": TestSyncIntegration, | 
| 508     "sync_integration": TestSyncIntegration, | 501     "sync_integration": TestSyncIntegration, | 
| 509     "test_shell": TestTestShell, "test_shell_tests": TestTestShell, | 502     "test_shell": TestTestShell, "test_shell_tests": TestTestShell, | 
| 510     "ui_unit": TestUIUnit,       "ui_unittests": TestUIUnit, | 503     "ui_unit": TestUIUnit,       "ui_unittests": TestUIUnit, | 
| 511     "unit": TestUnit,            "unit_tests": TestUnit, | 504     "unit": TestUnit,            "unit_tests": TestUnit, | 
| 512     "views": TestViews,          "views_unittests": TestViews, | 505     "views": TestViews,          "views_unittests": TestViews, | 
| 513     "gfx": TestGfx,              "gfx_unittests": TestGfx, |  | 
| 514   } | 506   } | 
| 515 | 507 | 
| 516 | 508 | 
| 517 def _main(): | 509 def _main(): | 
| 518   parser = optparse.OptionParser("usage: %prog -b <dir> -t <test> " | 510   parser = optparse.OptionParser("usage: %prog -b <dir> -t <test> " | 
| 519                                  "[-t <test> ...]") | 511                                  "[-t <test> ...]") | 
| 520   parser.disable_interspersed_args() | 512   parser.disable_interspersed_args() | 
| 521   parser.add_option("-b", "--build_dir", | 513   parser.add_option("-b", "--build_dir", | 
| 522                     help="the location of the compiler output") | 514                     help="the location of the compiler output") | 
| 523   parser.add_option("-t", "--test", action="append", default=[], | 515   parser.add_option("-t", "--test", action="append", default=[], | 
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 562 | 554 | 
| 563   for t in options.test: | 555   for t in options.test: | 
| 564     tests = ChromeTests(options, args, t) | 556     tests = ChromeTests(options, args, t) | 
| 565     ret = tests.Run() | 557     ret = tests.Run() | 
| 566     if ret: return ret | 558     if ret: return ret | 
| 567   return 0 | 559   return 0 | 
| 568 | 560 | 
| 569 | 561 | 
| 570 if __name__ == "__main__": | 562 if __name__ == "__main__": | 
| 571   sys.exit(_main()) | 563   sys.exit(_main()) | 
| OLD | NEW | 
|---|