Find issue number from comment in status file.

tools/testing/dart/status_file_parser.dart

Index: tools/testing/dart/status_file_parser.dart
diff --git a/tools/testing/dart/status_file_parser.dart b/tools/testing/dart/status_file_parser.dart
index dc3d5fe4e475bfa30383061e0bbaa78807a89bb6..0067cf51b2904c791c00223c55998ca360537723 100644
--- a/tools/testing/dart/status_file_parser.dart
+++ b/tools/testing/dart/status_file_parser.dart
@@ -24,9 +24,11 @@ const OK = "ok";
  */
 const SLOW = "slow";
 
-final RegExp StripComment = new RegExp("^[^#]*");
+final RegExp SplitComment = new RegExp("(^[^#]*)(:?#(.*))?");

[kustermann, 2013/08/20 14:29:56]

"(^[^#]*)(:?#(.*))?"  -->  "^([^#]*)(#.*)?$" ?

This is maybe a bit easier to read.
The first one greedily matches all non '#' characters from the beginning of the
line, the second one will match '#' and everything else until the end of the
line.

[Søren Gjesse, 2013/08/20 14:55:49]

Done. I only did it the other way to avoid having the # as part of the comment,
but it does not matter.

 final RegExp HeaderPattern = new RegExp(r"^\[([^\]]+)\]");
 final RegExp RulePattern = new RegExp(r"\s*([^: ]*)\s*:(.*)");
+final RegExp IssueNumberPattern =
+    new RegExp("Issue ([0-9]+)|dartbug.com/([0-9]+)", caseSensitive: false);

[kustermann, 2013/08/20 14:29:56]

I think there are more patterns, like:
 "Issue: 123"
 "http://dartbug.com/123"
 ...

Maybe we should just have a list of regular expressions, it would definitely be
easier to read.

[Søren Gjesse, 2013/08/20 14:55:49]

I know, but I think we should stick to these two, and maybe in the end just have
one. http:// in front of dartbug.com/ should be found.

 
 // TODO(whesse): Implement configuration_info library that contains data
 // structures for test configuration, including Section.
@@ -39,6 +41,10 @@ class Section {
 
   bool isEnabled(environment) =>
       condition == null || condition.evaluate(environment);
+
+  String toString() {
+    return "Section: $condition";
+  }
 }
 
 void ReadTestExpectationsInto(TestExpectations expectations,
@@ -75,11 +81,14 @@ void ReadConfigurationInto(path, sections, onDone) {
   sections.add(current);
 
   lines.listen((String line) {
-    Match match = StripComment.firstMatch(line);
-    line = (match == null) ? "" : match[0];
+    Match match = SplitComment.firstMatch(line);
+    line = (match == null) ? "" : match[1];
     line = line.trim();
     if (line.isEmpty) return;
 
+    // Extract the comment to get the issue number if needed.
+    String comment = (match == null || match[2] == null) ? "" : match[2];
+
     match = HeaderPattern.firstMatch(line);
     if (match != null) {
       String condition_string = match[1].trim();
@@ -98,7 +107,16 @@ void ReadConfigurationInto(path, sections, onDone) {
       List<String> tokens = new Tokenizer(expression_string).tokenize();
       SetExpression expression =
           new ExpressionParser(new Scanner(tokens)).parseSetExpression();
-      current.testRules.add(new TestRule(name, expression));
+
+      // Look for issue number in comment.
+      String issueString = null;
+      match = IssueNumberPattern.firstMatch(comment);
+      if (match != null) {
+        issueString = match[1];
+        if (issueString == null) issueString = match[2];

[kustermann, 2013/08/20 14:29:56]

Are you sure that if a optional group was not matched it's null and not ""?

[Søren Gjesse, 2013/08/20 14:55:49]

Yes - I tested it manually.

+      }
+      int issue = issueString != null ? int.parse(issueString) : null;
+      current.testRules.add(new TestRule(name, expression, issue));
       return;
     }
 
@@ -111,10 +129,13 @@ void ReadConfigurationInto(path, sections, onDone) {
 class TestRule {
   String name;
   SetExpression expression;
+  int issue;
+
+  TestRule(this.name, this.expression, this.issue);
 
-  TestRule(this.name, this.expression);
+  bool get hasIssue => issue != null;
 
-  String toString() => 'TestRule($name, $expression)';
+  String toString() => 'TestRule($name, $expression, $issue)';
 }