| 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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 def GetSourceForTest(self, testcase): | 79 def GetSourceForTest(self, testcase): |
| 80 filename = os.path.join(self.root, testcase.path + self.suffix()) | 80 filename = os.path.join(self.root, testcase.path + self.suffix()) |
| 81 with open(filename) as f: | 81 with open(filename) as f: |
| 82 return f.read() | 82 return f.read() |
| 83 | 83 |
| 84 def _IgnoreLine(self, string): | 84 def _IgnoreLine(self, string): |
| 85 """Ignore empty lines, valgrind output, Android output.""" | 85 """Ignore empty lines, valgrind output, Android output.""" |
| 86 if not string: return True | 86 if not string: return True |
| 87 if not string.strip(): return True | 87 if not string.strip(): return True |
| 88 return (string.startswith("==") or string.startswith("**") or | 88 return (string.startswith("==") or string.startswith("**") or |
| 89 string.startswith("ANDROID") or | 89 string.startswith("ANDROID")) |
| 90 # These five patterns appear in normal Native Client output. | |
| 91 string.startswith("DEBUG MODE ENABLED") or | |
| 92 string.startswith("tools/nacl-run.py") or | |
| 93 string.find("BYPASSING ALL ACL CHECKS") > 0 or | |
| 94 string.find("Native Client module will be loaded") > 0 or | |
| 95 string.find("NaClHostDescOpen:") > 0) | |
| 96 | 90 |
| 97 def IsFailureOutput(self, testcase): | 91 def IsFailureOutput(self, testcase): |
| 98 output = testcase.output | 92 output = testcase.output |
| 99 testpath = testcase.path | 93 testpath = testcase.path |
| 100 expected_path = os.path.join(self.root, testpath + ".out") | 94 expected_path = os.path.join(self.root, testpath + ".out") |
| 101 expected_lines = [] | 95 expected_lines = [] |
| 102 # Can't use utils.ReadLinesFrom() here because it strips whitespace. | 96 # Can't use utils.ReadLinesFrom() here because it strips whitespace. |
| 103 with open(expected_path) as f: | 97 with open(expected_path) as f: |
| 104 for line in f: | 98 for line in f: |
| 105 if line.startswith("#") or not line.strip(): continue | 99 if line.startswith("#") or not line.strip(): continue |
| (...skipping 11 matching lines...) Expand all Loading... |
| 117 if not re.match(pattern, actual): | 111 if not re.match(pattern, actual): |
| 118 return True | 112 return True |
| 119 return False | 113 return False |
| 120 | 114 |
| 121 def StripOutputForTransmit(self, testcase): | 115 def StripOutputForTransmit(self, testcase): |
| 122 pass | 116 pass |
| 123 | 117 |
| 124 | 118 |
| 125 def GetSuite(name, root): | 119 def GetSuite(name, root): |
| 126 return MessageTestSuite(name, root) | 120 return MessageTestSuite(name, root) |
| OLD | NEW |