| 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 """A tool used to run a Chrome test executable and process the output. | 6 """A tool used to run a Chrome test executable and process the output. |
| 7 | 7 |
| 8 This script is used by the buildbot slaves. It must be run from the outer | 8 This script is used by the buildbot slaves. It must be run from the outer |
| 9 build directory, e.g. chrome-release/build/. | 9 build directory, e.g. chrome-release/build/. |
| 10 | 10 |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 # only look for a system "google.*", even if our path is in sys.path before | 36 # only look for a system "google.*", even if our path is in sys.path before |
| 37 # importing "google.*". If we modify sys.path here, before importing | 37 # importing "google.*". If we modify sys.path here, before importing |
| 38 # "chromium_config", python2.6 properly uses our path to find our "google.*" | 38 # "chromium_config", python2.6 properly uses our path to find our "google.*" |
| 39 # (even though it still automatically adds the system "google" module to | 39 # (even though it still automatically adds the system "google" module to |
| 40 # sys.modules, and probably should still be using that to resolve "google.*", | 40 # sys.modules, and probably should still be using that to resolve "google.*", |
| 41 # which I really don't understand). | 41 # which I really don't understand). |
| 42 sys.path.insert(0, os.path.abspath('src/tools/python')) | 42 sys.path.insert(0, os.path.abspath('src/tools/python')) |
| 43 | 43 |
| 44 from common import chromium_utils | 44 from common import chromium_utils |
| 45 from common import gtest_utils | 45 from common import gtest_utils |
| 46 | |
| 47 # TODO(crbug.com/403564). We almost certainly shouldn't be importing this. | |
| 48 import config | 46 import config |
| 49 | |
| 50 from slave import annotation_utils | 47 from slave import annotation_utils |
| 51 from slave import build_directory | 48 from slave import build_directory |
| 52 from slave import crash_utils | 49 from slave import crash_utils |
| 53 from slave import gtest_slave_utils | 50 from slave import gtest_slave_utils |
| 54 from slave import process_log_utils | 51 from slave import process_log_utils |
| 55 from slave import results_dashboard | 52 from slave import results_dashboard |
| 56 from slave import slave_utils | 53 from slave import slave_utils |
| 57 from slave import xvfb | 54 from slave import xvfb |
| 58 | 55 |
| 59 USAGE = '%s [options] test.exe [test args]' % os.path.basename(sys.argv[0]) | 56 USAGE = '%s [options] test.exe [test args]' % os.path.basename(sys.argv[0]) |
| (...skipping 1871 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1931 finally: | 1928 finally: |
| 1932 if did_launch_dbus: | 1929 if did_launch_dbus: |
| 1933 # It looks like the command line argument --exit-with-session | 1930 # It looks like the command line argument --exit-with-session |
| 1934 # isn't working to clean up the spawned dbus-daemon. Kill it | 1931 # isn't working to clean up the spawned dbus-daemon. Kill it |
| 1935 # manually. | 1932 # manually. |
| 1936 _ShutdownDBus() | 1933 _ShutdownDBus() |
| 1937 | 1934 |
| 1938 | 1935 |
| 1939 if '__main__' == __name__: | 1936 if '__main__' == __name__: |
| 1940 sys.exit(main()) | 1937 sys.exit(main()) |
| OLD | NEW |