| OLD | NEW |
| 1 # Copyright (c) 2011 Google Inc. All rights reserved. | 1 # Copyright (c) 2011 Google Inc. All rights reserved. |
| 2 # Copyright (C) 2010 Chris Jerdonek (cjerdonek@webkit.org) | 2 # Copyright (C) 2010 Chris Jerdonek (cjerdonek@webkit.org) |
| 3 # | 3 # |
| 4 # Redistribution and use in source and binary forms, with or without | 4 # Redistribution and use in source and binary forms, with or without |
| 5 # modification, are permitted provided that the following conditions are | 5 # modification, are permitted provided that the following conditions are |
| 6 # met: | 6 # met: |
| 7 # | 7 # |
| 8 # * Redistributions of source code must retain the above copyright | 8 # * Redistributions of source code must retain the above copyright |
| 9 # notice, this list of conditions and the following disclaimer. | 9 # notice, this list of conditions and the following disclaimer. |
| 10 # * Redistributions in binary form must reproduce the above | 10 # * Redistributions in binary form must reproduce the above |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 (which means a file in sys.path that ends in .py). In addition, we need to | 32 (which means a file in sys.path that ends in .py). In addition, we need to |
| 33 ensure that sys.path / PYTHONPATH is set and propagating correctly. | 33 ensure that sys.path / PYTHONPATH is set and propagating correctly. |
| 34 | 34 |
| 35 This module enforces that. | 35 This module enforces that. |
| 36 """ | 36 """ |
| 37 | 37 |
| 38 import os | 38 import os |
| 39 import subprocess | 39 import subprocess |
| 40 import sys | 40 import sys |
| 41 | 41 |
| 42 from webkitpy.common import version_check # 'unused import' pylint: disable=W0
611 | 42 from webkitpy.common import version_check # pylint: disable=unused-import |
| 43 | 43 |
| 44 | 44 |
| 45 def run(*parts): | 45 def run(*parts): |
| 46 up = os.path.dirname | 46 up = os.path.dirname |
| 47 script_dir = up(up(up(os.path.abspath(__file__)))) | 47 script_dir = up(up(up(os.path.abspath(__file__)))) |
| 48 env = os.environ | 48 env = os.environ |
| 49 if 'PYTHONPATH' in env: | 49 if 'PYTHONPATH' in env: |
| 50 if script_dir not in env['PYTHONPATH']: | 50 if script_dir not in env['PYTHONPATH']: |
| 51 env['PYTHONPATH'] = env['PYTHONPATH'] + os.pathsep + script_dir | 51 env['PYTHONPATH'] = env['PYTHONPATH'] + os.pathsep + script_dir |
| 52 else: | 52 else: |
| (...skipping 14 matching lines...) Expand all Loading... |
| 67 | 67 |
| 68 try: | 68 try: |
| 69 # Temporary logging to try and diagnose hangs on the Windows bots. | 69 # Temporary logging to try and diagnose hangs on the Windows bots. |
| 70 if 'win_chromium_rel_ng' in sys.argv: | 70 if 'win_chromium_rel_ng' in sys.argv: |
| 71 print "sys.exit starting" | 71 print "sys.exit starting" |
| 72 sys.exit(proc.returncode) | 72 sys.exit(proc.returncode) |
| 73 finally: | 73 finally: |
| 74 # Temporary logging to try and diagnose hangs on the Windows bots. | 74 # Temporary logging to try and diagnose hangs on the Windows bots. |
| 75 if 'win_chromium_rel_ng' in sys.argv: | 75 if 'win_chromium_rel_ng' in sys.argv: |
| 76 print "sys.exit completed" | 76 print "sys.exit completed" |
| OLD | NEW |