| OLD | NEW |
| 1 # Copyright (C) 2010 Google Inc. All rights reserved. | 1 # Copyright (C) 2010 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 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 207 return | 207 return |
| 208 | 208 |
| 209 # this is a test file, do a quick check if it's in the | 209 # this is a test file, do a quick check if it's in the |
| 210 # full test suite. | 210 # full test suite. |
| 211 if expectation_line.path in self._all_tests: | 211 if expectation_line.path in self._all_tests: |
| 212 expectation_line.matching_tests.append(expectation_line.path) | 212 expectation_line.matching_tests.append(expectation_line.path) |
| 213 | 213 |
| 214 # FIXME: Update the original specifiers and remove this once the old syntax
is gone. | 214 # FIXME: Update the original specifiers and remove this once the old syntax
is gone. |
| 215 _configuration_tokens_list = [ | 215 _configuration_tokens_list = [ |
| 216 'Mac', 'SnowLeopard', 'Lion', 'MountainLion', 'Retina', 'Mavericks', 'Yo
semite', | 216 'Mac', 'SnowLeopard', 'Lion', 'MountainLion', 'Retina', 'Mavericks', 'Yo
semite', |
| 217 'Win', 'XP', 'Win7', 'Win8', 'Win10', | 217 'Win', 'XP', 'Win7', 'Win10', |
| 218 'Linux', 'Linux32', 'Precise', 'Trusty', | 218 'Linux', 'Linux32', 'Precise', 'Trusty', |
| 219 'Android', | 219 'Android', |
| 220 'Release', | 220 'Release', |
| 221 'Debug', | 221 'Debug', |
| 222 ] | 222 ] |
| 223 | 223 |
| 224 _configuration_tokens = dict((token, token.upper()) for token in _configurat
ion_tokens_list) | 224 _configuration_tokens = dict((token, token.upper()) for token in _configurat
ion_tokens_list) |
| 225 _inverted_configuration_tokens = dict((value, name) for name, value in _conf
iguration_tokens.iteritems()) | 225 _inverted_configuration_tokens = dict((value, name) for name, value in _conf
iguration_tokens.iteritems()) |
| 226 | 226 |
| 227 # FIXME: Update the original specifiers list and remove this once the old sy
ntax is gone. | 227 # FIXME: Update the original specifiers list and remove this once the old sy
ntax is gone. |
| (...skipping 910 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1138 # If reconstitute_only_these is an empty list, we want to return ori
ginal_string. | 1138 # If reconstitute_only_these is an empty list, we want to return ori
ginal_string. |
| 1139 # So we need to compare reconstitute_only_these to None, not just ch
eck if it's falsey. | 1139 # So we need to compare reconstitute_only_these to None, not just ch
eck if it's falsey. |
| 1140 if reconstitute_only_these is None or expectation_line in reconstitu
te_only_these: | 1140 if reconstitute_only_these is None or expectation_line in reconstitu
te_only_these: |
| 1141 return expectation_line.to_string(test_configuration_converter) | 1141 return expectation_line.to_string(test_configuration_converter) |
| 1142 return expectation_line.original_string | 1142 return expectation_line.original_string |
| 1143 | 1143 |
| 1144 def nones_out(expectation_line): | 1144 def nones_out(expectation_line): |
| 1145 return expectation_line is not None | 1145 return expectation_line is not None |
| 1146 | 1146 |
| 1147 return "\n".join(filter(nones_out, map(serialize, expectation_lines))) | 1147 return "\n".join(filter(nones_out, map(serialize, expectation_lines))) |
| OLD | NEW |