| OLD | NEW |
| 1 # Copyright (c) 2014 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 """Base script for doing test setup.""" | 5 """Base script for doing test setup.""" |
| 6 | 6 |
| 7 import logging | 7 import logging |
| 8 import os | 8 import os |
| 9 | 9 |
| 10 from pylib import constants | 10 from pylib import constants |
| 11 from pylib import valgrind_tools | 11 from pylib import valgrind_tools |
| 12 from pylib.constants import host_paths |
| 12 from pylib.utils import isolator | 13 from pylib.utils import isolator |
| 13 | 14 |
| 14 def GenerateDepsDirUsingIsolate(suite_name, isolate_file_path, | 15 def GenerateDepsDirUsingIsolate(suite_name, isolate_file_path, |
| 15 isolate_file_paths, deps_exclusion_list): | 16 isolate_file_paths, deps_exclusion_list): |
| 16 """Generate the dependency dir for the test suite using isolate. | 17 """Generate the dependency dir for the test suite using isolate. |
| 17 | 18 |
| 18 Args: | 19 Args: |
| 19 suite_name: Name of the test suite (e.g. base_unittests). | 20 suite_name: Name of the test suite (e.g. base_unittests). |
| 20 isolate_file_path: .isolate file path to use. If there is a default .isolate | 21 isolate_file_path: .isolate file path to use. If there is a default .isolate |
| 21 file path for the suite_name, this will override it. | 22 file path for the suite_name, this will override it. |
| 22 isolate_file_paths: Dictionary with the default .isolate file paths for | 23 isolate_file_paths: Dictionary with the default .isolate file paths for |
| 23 the test suites. | 24 the test suites. |
| 24 deps_exclusion_list: A list of files that are listed as dependencies in the | 25 deps_exclusion_list: A list of files that are listed as dependencies in the |
| 25 .isolate files but should not be pushed to the device. | 26 .isolate files but should not be pushed to the device. |
| 26 Returns: | 27 Returns: |
| 27 The Isolator instance used to remap the dependencies, or None. | 28 The Isolator instance used to remap the dependencies, or None. |
| 28 """ | 29 """ |
| 29 if isolate_file_path: | 30 if isolate_file_path: |
| 30 if os.path.isabs(isolate_file_path): | 31 if os.path.isabs(isolate_file_path): |
| 31 isolate_abs_path = isolate_file_path | 32 isolate_abs_path = isolate_file_path |
| 32 else: | 33 else: |
| 33 isolate_abs_path = os.path.join(constants.DIR_SOURCE_ROOT, | 34 isolate_abs_path = os.path.join(host_paths.DIR_SOURCE_ROOT, |
| 34 isolate_file_path) | 35 isolate_file_path) |
| 35 else: | 36 else: |
| 36 isolate_rel_path = isolate_file_paths.get(suite_name) | 37 isolate_rel_path = isolate_file_paths.get(suite_name) |
| 37 if not isolate_rel_path: | 38 if not isolate_rel_path: |
| 38 logging.info('Did not find an isolate file for the test suite.') | 39 logging.info('Did not find an isolate file for the test suite.') |
| 39 return | 40 return |
| 40 isolate_abs_path = os.path.join(constants.DIR_SOURCE_ROOT, isolate_rel_path) | 41 isolate_abs_path = os.path.join(host_paths.DIR_SOURCE_ROOT, |
| 42 isolate_rel_path) |
| 41 | 43 |
| 42 isolated_abs_path = os.path.join( | 44 isolated_abs_path = os.path.join( |
| 43 constants.GetOutDirectory(), '%s.isolated' % suite_name) | 45 constants.GetOutDirectory(), '%s.isolated' % suite_name) |
| 44 assert os.path.exists(isolate_abs_path), 'Cannot find %s' % isolate_abs_path | 46 assert os.path.exists(isolate_abs_path), 'Cannot find %s' % isolate_abs_path |
| 45 | 47 |
| 46 i = isolator.Isolator() | 48 i = isolator.Isolator() |
| 47 i.Clear() | 49 i.Clear() |
| 48 i.Remap(isolate_abs_path, isolated_abs_path) | 50 i.Remap(isolate_abs_path, isolated_abs_path) |
| 49 # We're relying on the fact that timestamps are preserved | 51 # We're relying on the fact that timestamps are preserved |
| 50 # by the remap command (hardlinked). Otherwise, all the data | 52 # by the remap command (hardlinked). Otherwise, all the data |
| 51 # will be pushed to the device once we move to using time diff | 53 # will be pushed to the device once we move to using time diff |
| 52 # instead of md5sum. Perform a sanity check here. | 54 # instead of md5sum. Perform a sanity check here. |
| 53 i.VerifyHardlinks() | 55 i.VerifyHardlinks() |
| 54 i.PurgeExcluded(deps_exclusion_list) | 56 i.PurgeExcluded(deps_exclusion_list) |
| 55 i.MoveOutputDeps() | 57 i.MoveOutputDeps() |
| 56 return i | 58 return i |
| 57 | 59 |
| 58 | 60 |
| 59 def PushDataDeps(device, host_dir, device_dir, test_options): | 61 def PushDataDeps(device, host_dir, device_dir, test_options): |
| 60 valgrind_tools.PushFilesForTool(test_options.tool, device) | 62 valgrind_tools.PushFilesForTool(test_options.tool, device) |
| 61 if os.path.exists(host_dir): | 63 if os.path.exists(host_dir): |
| 62 device.PushChangedFiles([(host_dir, device_dir)], | 64 device.PushChangedFiles([(host_dir, device_dir)], |
| 63 delete_device_stale=test_options.delete_stale_data) | 65 delete_device_stale=test_options.delete_stale_data) |
| OLD | NEW |