OLD | NEW |
1 # Copyright 2008 the V8 project authors. All rights reserved. | 1 # Copyright 2008 the V8 project authors. All rights reserved. |
2 # Redistribution and use in source and binary forms, with or without | 2 # Redistribution and use in source and binary forms, with or without |
3 # modification, are permitted provided that the following conditions are | 3 # modification, are permitted provided that the following conditions are |
4 # met: | 4 # met: |
5 # | 5 # |
6 # * Redistributions of source code must retain the above copyright | 6 # * Redistributions of source code must retain the above copyright |
7 # notice, this list of conditions and the following disclaimer. | 7 # notice, this list of conditions and the following disclaimer. |
8 # * Redistributions in binary form must reproduce the above | 8 # * Redistributions in binary form must reproduce the above |
9 # copyright notice, this list of conditions and the following | 9 # copyright notice, this list of conditions and the following |
10 # disclaimer in the documentation and/or other materials provided | 10 # disclaimer in the documentation and/or other materials provided |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
50 shell += ".exe" | 50 shell += ".exe" |
51 output = commands.Execute(context.command_prefix + | 51 output = commands.Execute(context.command_prefix + |
52 [shell, "--list"] + | 52 [shell, "--list"] + |
53 context.extra_flags) | 53 context.extra_flags) |
54 if output.exit_code != 0: | 54 if output.exit_code != 0: |
55 print output.stdout | 55 print output.stdout |
56 print output.stderr | 56 print output.stderr |
57 return [] | 57 return [] |
58 tests = [] | 58 tests = [] |
59 for test_desc in output.stdout.strip().split(): | 59 for test_desc in output.stdout.strip().split(): |
| 60 if test_desc.find('<') < 0: |
| 61 # Native Client output can contain a few non-test arguments |
| 62 # before the tests. Skip these. |
| 63 continue |
60 raw_test, dependency = test_desc.split('<') | 64 raw_test, dependency = test_desc.split('<') |
61 if dependency != '': | 65 if dependency != '': |
62 dependency = raw_test.split('/')[0] + '/' + dependency | 66 dependency = raw_test.split('/')[0] + '/' + dependency |
63 else: | 67 else: |
64 dependency = None | 68 dependency = None |
65 test = testcase.TestCase(self, raw_test, dependency=dependency) | 69 test = testcase.TestCase(self, raw_test, dependency=dependency) |
66 tests.append(test) | 70 tests.append(test) |
67 tests.sort() | 71 tests.sort() |
68 return tests | 72 return tests |
69 | 73 |
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
170 return result | 174 return result |
171 | 175 |
172 def GetTestStatus(self, sections, defs): | 176 def GetTestStatus(self, sections, defs): |
173 status_file = join(self.root, 'cctest.status') | 177 status_file = join(self.root, 'cctest.status') |
174 if exists(status_file): | 178 if exists(status_file): |
175 test.ReadConfigurationInto(status_file, sections, defs) | 179 test.ReadConfigurationInto(status_file, sections, defs) |
176 | 180 |
177 | 181 |
178 def GetConfiguration(context, root): | 182 def GetConfiguration(context, root): |
179 return CcTestConfiguration(context, root) | 183 return CcTestConfiguration(context, root) |
OLD | NEW |