| OLD | NEW |
| 1 # Copyright (C) 2011 Google Inc. All rights reserved. | 1 # Copyright (C) 2011 Google Inc. All rights reserved. |
| 2 # | 2 # |
| 3 # Redistribution and use in source and binary forms, with or without | 3 # Redistribution and use in source and binary forms, with or without |
| 4 # modification, are permitted provided that the following conditions are | 4 # modification, are permitted provided that the following conditions are |
| 5 # met: | 5 # met: |
| 6 # | 6 # |
| 7 # * Redistributions of source code must retain the above copyright | 7 # * Redistributions of source code must retain the above copyright |
| 8 # notice, this list of conditions and the following disclaimer. | 8 # notice, this list of conditions and the following disclaimer. |
| 9 # * Redistributions in binary form must reproduce the above | 9 # * Redistributions in binary form must reproduce the above |
| 10 # copyright notice, this list of conditions and the following disclaimer | 10 # copyright notice, this list of conditions and the following disclaimer |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 | 51 |
| 52 Args: | 52 Args: |
| 53 paths: a list of path expressions relative to base_dir | 53 paths: a list of path expressions relative to base_dir |
| 54 to search. Glob patterns are ok, as are path expressions with | 54 to search. Glob patterns are ok, as are path expressions with |
| 55 forward slashes on Windows. If paths is empty, we look at | 55 forward slashes on Windows. If paths is empty, we look at |
| 56 everything under the base_dir. | 56 everything under the base_dir. |
| 57 """ | 57 """ |
| 58 | 58 |
| 59 paths = paths or ['*'] | 59 paths = paths or ['*'] |
| 60 skipped_directories = skipped_directories or set(['.svn', '_svn']) | 60 skipped_directories = skipped_directories or set(['.svn', '_svn']) |
| 61 return _normalized_find(filesystem, _normalize(filesystem, base_dir, paths),
skipped_directories, file_filter, directory_sort_key) | 61 return _normalized_find(filesystem, _normalize( |
| 62 filesystem, base_dir, paths), skipped_directories, file_filter, director
y_sort_key) |
| 62 | 63 |
| 63 | 64 |
| 64 def _normalize(filesystem, base_dir, paths): | 65 def _normalize(filesystem, base_dir, paths): |
| 65 return [filesystem.normpath(filesystem.join(base_dir, path)) for path in pat
hs] | 66 return [filesystem.normpath(filesystem.join(base_dir, path)) for path in pat
hs] |
| 66 | 67 |
| 67 | 68 |
| 68 def _normalized_find(filesystem, paths, skipped_directories, file_filter, direct
ory_sort_key): | 69 def _normalized_find(filesystem, paths, skipped_directories, file_filter, direct
ory_sort_key): |
| 69 """Finds the set of tests under the list of paths. | 70 """Finds the set of tests under the list of paths. |
| 70 | 71 |
| 71 Args: | 72 Args: |
| 72 paths: a list of absolute path expressions to search. | 73 paths: a list of absolute path expressions to search. |
| 73 Glob patterns are ok. | 74 Glob patterns are ok. |
| 74 """ | 75 """ |
| 75 | 76 |
| 76 paths_to_walk = itertools.chain(*(filesystem.glob(path) for path in paths)) | 77 paths_to_walk = itertools.chain(*(filesystem.glob(path) for path in paths)) |
| 77 | 78 |
| 78 def sort_by_directory_key(files_list): | 79 def sort_by_directory_key(files_list): |
| 79 if directory_sort_key: | 80 if directory_sort_key: |
| 80 files_list.sort(key=directory_sort_key) | 81 files_list.sort(key=directory_sort_key) |
| 81 return files_list | 82 return files_list |
| 82 | 83 |
| 83 all_files = itertools.chain(*(sort_by_directory_key(filesystem.files_under(p
ath, | 84 all_files = itertools.chain(*(sort_by_directory_key(filesystem.files_under(p
ath, |
| 84 s
kipped_directories, file_filter)) for path in paths_to_walk)) | 85 s
kipped_directories, file_filter)) for path in paths_to_walk)) |
| 85 return all_files | 86 return all_files |
| OLD | NEW |