Index: mojo/public/tools/dart_analyze.py |
diff --git a/mojo/public/tools/dart_analyze.py b/mojo/public/tools/dart_analyze.py |
index 5de680c0411c9f2887707d25d7449dc8d42b7fd8..5da1de46be09463afe8216f04672302fd0c11adb 100755 |
--- a/mojo/public/tools/dart_analyze.py |
+++ b/mojo/public/tools/dart_analyze.py |
@@ -20,15 +20,12 @@ import tempfile |
import zipfile |
_ANALYZING_PATTERN = re.compile(r'^Analyzing \[') |
-_FINAL_REPORT_PATTERN = re.compile(r'^[0-9]+ errors and [0-9]+ warnings found.') |
+_FINAL_REPORT_PATTERN = re.compile( |
+ r'^[0-9]+ errors( and [0-9]+ warnings)* found.') |
Elliot Glaysher
2015/03/10 21:11:02
You probably also want to add ? to the two 's' cha
zra
2015/03/10 21:28:37
I just took the regexes from your CL =)
|
_NATIVE_ERROR_PATTERN = re.compile( |
r'^\[error\] Native functions can only be declared in the SDK and code that ' |
r'is loaded through native extensions') |
-_WARNING_PATTERN = re.compile(r'^\[warning\]') |
-_THAT_ONE_BROKEN_CLOSE_IN_WEB_SOCKETS_PATTERN = re.compile( |
- r'^\[error\] The name \'close\' is already defined') |
- |
def main(args): |
dartzip_file = args.pop(0) |
@@ -65,9 +62,7 @@ def main(args): |
not re.match(_ANALYZING_PATTERN, i) and |
not re.match(_FINAL_REPORT_PATTERN, i) and |
# TODO(erg): Remove the rest of these as fixes land: |
- not re.match(_WARNING_PATTERN, i) and |
- not re.match(_NATIVE_ERROR_PATTERN, i) and |
- not re.match(_THAT_ONE_BROKEN_CLOSE_IN_WEB_SOCKETS_PATTERN, i))] |
+ not re.match(_NATIVE_ERROR_PATTERN, i))] |
for line in filtered_lines: |
passed = False |
print >> sys.stderr, line.replace(temp_dir + "/", dartzip_basename) |