diff options
| author | Jesse Wilson <jessewilson@google.com> | 2009-12-19 23:48:33 -0800 |
|---|---|---|
| committer | Jesse Wilson <jessewilson@google.com> | 2009-12-20 00:11:45 -0800 |
| commit | bd2ee3322ca3b4cec38353907ca216b2ff4dd50d (patch) | |
| tree | 06cb6072c4c66187c7ad8367755d1000ab84a213 /tools/runner | |
| parent | fe90e00a26ac67c775fa5c7ca7be5d51e5b79d89 (diff) | |
| download | libcore-bd2ee3322ca3b4cec38353907ca216b2ff4dd50d.zip libcore-bd2ee3322ca3b4cec38353907ca216b2ff4dd50d.tar.gz libcore-bd2ee3322ca3b4cec38353907ca216b2ff4dd50d.tar.bz2 | |
Fixing a busted regex in the expectations file. Also doing regex checking upfront.
Diffstat (limited to 'tools/runner')
| -rw-r--r-- | tools/runner/expectations.txt | 2 | ||||
| -rw-r--r-- | tools/runner/java/dalvik/runner/ExpectedResult.java | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/tools/runner/expectations.txt b/tools/runner/expectations.txt index 6b0a2f3..44d26d0 100644 --- a/tools/runner/expectations.txt +++ b/tools/runner/expectations.txt @@ -15,7 +15,7 @@ pattern .*Hit infinite wait condition.* # are allowed to buffer input as necessary. test java.io.StreamTokenizer.Reset result EXEC_FAILED -pattern .*should get token \\[\, but get -1.* +pattern .*Test failed: should get token \[, but get -1.* # These tests rely on Java 6 APIs diff --git a/tools/runner/java/dalvik/runner/ExpectedResult.java b/tools/runner/java/dalvik/runner/ExpectedResult.java index 256838e..6bb8a7f 100644 --- a/tools/runner/java/dalvik/runner/ExpectedResult.java +++ b/tools/runner/java/dalvik/runner/ExpectedResult.java @@ -22,6 +22,7 @@ import java.io.FileReader; import java.io.IOException; import java.util.HashMap; import java.util.Map; +import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -31,7 +32,7 @@ import java.util.regex.Pattern; * <pre> * test java.io.StreamTokenizer.Reset * result UNSUPPORTED - * pattern .*should get token \\[\, but get -1.* + * pattern .*should get token \[, but get -1.* * * # should we fix this? * test java.util.Arrays.CopyMethods @@ -41,6 +42,8 @@ import java.util.regex.Pattern; */ class ExpectedResult { + private static final Logger logger = Logger.getLogger(ExpectedResult.class.getName()); + /** Matches lines in the file containing a key and value pair. */ private static final Pattern KEY_VALUE_PAIR_PATTERN = Pattern.compile("(\\w+)\\s+(.+)"); @@ -65,6 +68,9 @@ class ExpectedResult { if (result == null) { throw new IllegalArgumentException(); } + if (pattern != null) { + Pattern.compile(pattern); // verify that the pattern is well-formed + } this.result = result; this.pattern = pattern; @@ -80,6 +86,8 @@ class ExpectedResult { public static Map<String, ExpectedResult> parse(File expectationsFile) throws IOException { + logger.fine("loading expectations file " + expectationsFile); + BufferedReader reader = new BufferedReader(new FileReader(expectationsFile)); try { Map<String, ExpectedResult> results = new HashMap<String, ExpectedResult>(); @@ -145,6 +153,7 @@ class ExpectedResult { } } + logger.fine("loaded " + results.size() + " expectations."); return results; } finally { reader.close(); |