| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # Copyright (c) 2011 Google Inc. All rights reserved. | 2 # Copyright (c) 2011 Google Inc. All rights reserved. |
| 3 # Copyright (C) 2010 Chris Jerdonek (cjerdonek@webkit.org) | 3 # Copyright (C) 2010 Chris Jerdonek (cjerdonek@webkit.org) |
| 4 # | 4 # |
| 5 # Redistribution and use in source and binary forms, with or without | 5 # Redistribution and use in source and binary forms, with or without |
| 6 # modification, are permitted provided that the following conditions are | 6 # modification, are permitted provided that the following conditions are |
| 7 # met: | 7 # met: |
| 8 # | 8 # |
| 9 # * Redistributions of source code must retain the above copyright | 9 # * Redistributions of source code must retain the above copyright |
| 10 # notice, this list of conditions and the following disclaimer. | 10 # notice, this list of conditions and the following disclaimer. |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 24 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 25 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 25 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 26 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 26 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 27 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 27 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 28 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 28 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 29 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 29 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 30 | 30 |
| 31 import os | 31 import os |
| 32 import sys | 32 import sys |
| 33 | 33 |
| 34 dirname = os.path.dirname | 34 from webkitpy import path_finder |
| 35 scripts_dir = dirname(os.path.realpath(__file__)) | 35 path_finder.find_typ_dir() |
| 36 chromium_src_dir = dirname(dirname(dirname(dirname(scripts_dir)))) | |
| 37 | |
| 38 path_to_typ = os.path.join(chromium_src_dir, 'third_party', 'typ') | |
| 39 if path_to_typ not in sys.path: | |
| 40 sys.path.append(path_to_typ) | |
| 41 | 36 |
| 42 import typ | 37 import typ |
| 43 | 38 |
| 44 skip = [] | 39 skip = [] |
| 45 if sys.platform == 'win32': | 40 if sys.platform == 'win32': |
| 46 # These test fail on win32. We could annotate some of these in | 41 # These test fail on win32. We could annotate some of these in |
| 47 # class-level skips, but we don't support package/module-level skips. | 42 # class-level skips, but we don't support package/module-level skips. |
| 48 # bugs.webkit.org/show_bug.cgi?id=54526 . | 43 # bugs.webkit.org/show_bug.cgi?id=54526 . |
| 49 skip = [ | 44 skip = [ |
| 50 'webkitpy.common.checkout.*', | 45 'webkitpy.common.checkout.*', |
| 51 'webkitpy.common.config.*', | 46 'webkitpy.common.config.*', |
| 52 'webkitpy.tool.*', | 47 'webkitpy.tool.*', |
| 53 'webkitpy.w3c.*', | 48 'webkitpy.w3c.*', |
| 54 'webkitpy.layout_tests.layout_package.bot_test_expectations_unittest.*', | 49 'webkitpy.layout_tests.layout_package.bot_test_expectations_unittest.*', |
| 55 ] | 50 ] |
| 56 | 51 |
| 57 sys.exit(typ.main(top_level_dir=scripts_dir, | 52 sys.exit(typ.main(top_level_dir=path_finder.get_scripts_dir(), |
| 58 skip=skip, | 53 skip=skip, |
| 59 path=[os.path.join(scripts_dir, 'webkitpy', 'thirdparty')], | 54 path=[path_finder.get_webkitpy_thirdparty_dir()], |
| 60 win_multiprocessing='spawn')) | 55 win_multiprocessing='spawn')) |
| OLD | NEW |