| OLD | NEW |
| 1 # Copyright 2013 the V8 project authors. All rights reserved. | 1 # Copyright 2013 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 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 def _IgnoreLine(self, string): | 102 def _IgnoreLine(self, string): |
| 103 """Ignore empty lines, valgrind output and Android output.""" | 103 """Ignore empty lines, valgrind output and Android output.""" |
| 104 if not string: return True | 104 if not string: return True |
| 105 return (string.startswith("==") or string.startswith("**") or | 105 return (string.startswith("==") or string.startswith("**") or |
| 106 string.startswith("ANDROID") or | 106 string.startswith("ANDROID") or |
| 107 # These five patterns appear in normal Native Client output. | 107 # These five patterns appear in normal Native Client output. |
| 108 string.startswith("DEBUG MODE ENABLED") or | 108 string.startswith("DEBUG MODE ENABLED") or |
| 109 string.startswith("tools/nacl-run.py") or | 109 string.startswith("tools/nacl-run.py") or |
| 110 string.find("BYPASSING ALL ACL CHECKS") > 0 or | 110 string.find("BYPASSING ALL ACL CHECKS") > 0 or |
| 111 string.find("Native Client module will be loaded") > 0 or | 111 string.find("Native Client module will be loaded") > 0 or |
| 112 string.find("NaClHostDescOpen:") > 0) | 112 string.find("NaClHostDescOpen:") > 0 or |
| 113 # FIXME(machenbach): The test driver shouldn't try to use slow |
| 114 # asserts if they weren't compiled. This fails in optdebug=2. |
| 115 string == "Warning: unknown flag --enable-slow-asserts." or |
| 116 string == "Try --help for options") |
| 113 | 117 |
| 114 def IsFailureOutput(self, output, testpath): | 118 def IsFailureOutput(self, output, testpath): |
| 115 if super(WebkitTestSuite, self).IsFailureOutput(output, testpath): | 119 if super(WebkitTestSuite, self).IsFailureOutput(output, testpath): |
| 116 return True | 120 return True |
| 117 file_name = os.path.join(self.root, testpath) + "-expected.txt" | 121 file_name = os.path.join(self.root, testpath) + "-expected.txt" |
| 118 with file(file_name, "r") as expected: | 122 with file(file_name, "r") as expected: |
| 119 expected_lines = expected.readlines() | 123 expected_lines = expected.readlines() |
| 120 | 124 |
| 121 def ExpIterator(): | 125 def ExpIterator(): |
| 122 for line in expected_lines: | 126 for line in expected_lines: |
| (...skipping 27 matching lines...) Expand all Loading... |
| 150 for act_iterator in ActBlockIterator(): | 154 for act_iterator in ActBlockIterator(): |
| 151 for (expected, actual) in itertools.izip_longest( | 155 for (expected, actual) in itertools.izip_longest( |
| 152 ExpIterator(), act_iterator, fillvalue=''): | 156 ExpIterator(), act_iterator, fillvalue=''): |
| 153 if expected != actual: | 157 if expected != actual: |
| 154 return True | 158 return True |
| 155 return False | 159 return False |
| 156 | 160 |
| 157 | 161 |
| 158 def GetSuite(name, root): | 162 def GetSuite(name, root): |
| 159 return WebkitTestSuite(name, root) | 163 return WebkitTestSuite(name, root) |
| OLD | NEW |