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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
48 | 48 |
49 def GetName(self): | 49 def GetName(self): |
50 return self.path[-1] | 50 return self.path[-1] |
51 | 51 |
52 def GetCommand(self): | 52 def GetCommand(self): |
53 result = [self.config.context.GetVm(self.mode)] | 53 result = [self.config.context.GetVm(self.mode)] |
54 source = open(self.file).read() | 54 source = open(self.file).read() |
55 flags_match = FLAGS_PATTERN.search(source) | 55 flags_match = FLAGS_PATTERN.search(source) |
56 if flags_match: | 56 if flags_match: |
57 result += flags_match.group(1).strip().split() | 57 result += flags_match.group(1).strip().split() |
| 58 files_match = FILES_PATTERN.search(source); |
58 additional_files = [] | 59 additional_files = [] |
59 files_match = FILES_PATTERN.search(source); | 60 if files_match: |
60 # Accept several lines of 'Files:' | 61 additional_files += files_match.group(1).strip().split() |
61 while True: | |
62 if files_match: | |
63 additional_files += files_match.group(1).strip().split() | |
64 files_match = FILES_PATTERN.search(source, files_match.end()) | |
65 else: | |
66 break | |
67 for a_file in additional_files: | 62 for a_file in additional_files: |
68 result.append(join(dirname(self.config.root), '..', a_file)) | 63 result.append(join(dirname(self.config.root), '..', a_file)) |
69 framework = join(dirname(self.config.root), 'mjsunit', 'mjsunit.js') | 64 framework = join(dirname(self.config.root), 'mjsunit', 'mjsunit.js') |
70 result += [framework, self.file] | 65 result += [framework, self.file] |
71 return result | 66 return result |
72 | 67 |
73 def GetSource(self): | 68 def GetSource(self): |
74 return open(self.file).read() | 69 return open(self.file).read() |
75 | 70 |
76 | 71 |
(...skipping 25 matching lines...) Expand all Loading... |
102 | 97 |
103 def GetTestStatus(self, sections, defs): | 98 def GetTestStatus(self, sections, defs): |
104 status_file = join(self.root, 'mjsunit.status') | 99 status_file = join(self.root, 'mjsunit.status') |
105 if exists(status_file): | 100 if exists(status_file): |
106 test.ReadConfigurationInto(status_file, sections, defs) | 101 test.ReadConfigurationInto(status_file, sections, defs) |
107 | 102 |
108 | 103 |
109 | 104 |
110 def GetConfiguration(context, root): | 105 def GetConfiguration(context, root): |
111 return MjsunitTestConfiguration(context, root) | 106 return MjsunitTestConfiguration(context, root) |
OLD | NEW |