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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
49 return "%s %s" % (self.mode, self.GetName()) | 49 return "%s %s" % (self.mode, self.GetName()) |
50 | 50 |
51 def GetName(self): | 51 def GetName(self): |
52 return self.path[-1] + ["", "-isolates"][self.isolates] | 52 return self.path[-1] + ["", "-isolates"][self.isolates] |
53 | 53 |
54 def TestsIsolates(self): | 54 def TestsIsolates(self): |
55 return self.isolates | 55 return self.isolates |
56 | 56 |
57 def GetVmCommand(self, source): | 57 def GetVmCommand(self, source): |
58 result = self.config.context.GetVmCommand(self, self.mode) | 58 result = self.config.context.GetVmCommand(self, self.mode) |
59 flags_match = FLAGS_PATTERN.search(source) | 59 flags_match = re.findall(FLAGS_PATTERN, source); |
60 if flags_match: | 60 for match in flags_match: |
61 result += flags_match.group(1).strip().split() | 61 result += match.strip().split() |
62 return result | 62 return result |
63 | 63 |
64 def GetVmArguments(self, source): | 64 def GetVmArguments(self, source): |
65 result = [] | 65 result = [] |
66 additional_files = [] | 66 additional_files = [] |
67 files_match = FILES_PATTERN.search(source); | 67 files_match = FILES_PATTERN.search(source); |
68 # Accept several lines of 'Files:' | 68 # Accept several lines of 'Files:' |
69 while True: | 69 while True: |
70 if files_match: | 70 if files_match: |
71 additional_files += files_match.group(1).strip().split() | 71 additional_files += files_match.group(1).strip().split() |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
149 | 149 |
150 def GetTestStatus(self, sections, defs): | 150 def GetTestStatus(self, sections, defs): |
151 status_file = join(self.root, 'mjsunit.status') | 151 status_file = join(self.root, 'mjsunit.status') |
152 if exists(status_file): | 152 if exists(status_file): |
153 test.ReadConfigurationInto(status_file, sections, defs) | 153 test.ReadConfigurationInto(status_file, sections, defs) |
154 | 154 |
155 | 155 |
156 | 156 |
157 def GetConfiguration(context, root): | 157 def GetConfiguration(context, root): |
158 return MjsunitTestConfiguration(context, root) | 158 return MjsunitTestConfiguration(context, root) |
OLD | NEW |