summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Canciani <ranma42@gmail.com>2011-06-24 23:04:11 +0200
committerAndrea Canciani <ranma42@gmail.com>2011-06-25 10:19:36 +0200
commit5fffa3fae122da624aa79923ff13c781842e005d (patch)
tree2f2a3258436c373830c10eb6a2e2719f27477914
parent0baf009b39c75dbc604800b9bd4c9f017a87d763 (diff)
test: Ignore \r when parsing test log files
This fixes the log parsing on win32.
-rw-r--r--test/testtable.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/testtable.js b/test/testtable.js
index daf64503..8cf71567 100644
--- a/test/testtable.js
+++ b/test/testtable.js
@@ -358,7 +358,7 @@ function parseTest (testData) {
var rows = new Array ();
var data = new Object ();
var t = new Test ();
- var lines = testData.split ("\n");
+ var lines = testData.replace (/\r/g, "").split ("\n");
for (var i = 0; i < lines.length; i++) {
t.addData (lines[i].split (" "));
if (t.isComplete ()) {
@@ -406,7 +406,7 @@ function parseFile (fileName, parser) {
function parseTestList (listData) {
var summaryRE = /\d+ Passed, \d+ Failed \x5b\d+ crashed, \d+ expected\x5d, \d+ Skipped/;
- var lines = listData.split ("\n");
+ var lines = listData.replace (/\r/g, "").split ("\n");
for (var i = 0; i < lines.length; i++) {
if (summaryRE.test (lines[i]))
return;