Reviewers: MikeSamuel,
Description:
The continuous build script was breaking because:
* the output format of emma coverage changed
* malformed javadoc would cause java/doc/index.html not to be created
which caused outputTree to exit
Please review this at http://codereview.appspot.com/164048
Affected files:
M src/com/google/caja/lang/css/CssPropertyPatterns.java
M tools/dashboard/dashboard.pl
Index: tools/dashboard/dashboard.pl
===================================================================
--- tools/dashboard/dashboard.pl (revision 3869)
+++ tools/dashboard/dashboard.pl (working copy)
@@ -170,15 +170,6 @@
print STDERR "building testbed\n";
track(\&build, ['testbed'], 'testbed', \...@status_log);
- print STDERR "running compatible library tests\n";
- track(\&updatePrototypeClient, [], 'prototype', \...@status_log);
- track(\&rakePrototype, ['caja:test'], 'prototype tests', \...@status_log);
-
- print STDERR "running selenium\n";
- track(\&farm, ['all'], 'selenium', \...@status_log);
- extractSeleniumSummary("$REPORTS_DIR/selenium/TESTS-TestSuites.xml",
- \...@status_log);
-
print STDERR "making output directory\n";
makeOutputDir();
@@ -189,8 +180,6 @@
print STDERR "copying test reports\n";
outputTree("$REPORTS_DIR/tests", 'tests', 'index.html', \...@status_log);
outputTree("$REPORTS_DIR/coverage", 'coverage', 'index.html',
\...@status_log);
- outputTree("$REPORTS_DIR/selenium", 'selenium', 'index.html',
\...@status_log);
- outputTree("$PROTOTYPEJS/test/unit/tmp/", 'prototype', '.',
\...@status_log);
print STDERR "copying demos\n";
outputTree($DEMOS_DIR, 'demos', '', \...@status_log);
@@ -462,7 +451,7 @@
my $summaryTable = $&;
my ($pct, $covered, $total) = ($summaryTable
- =~ m|<td>([\d\.]+)%\s*\(([\d\.]+)/([\d\.]+)\)</TD></TR>|i);
+ =~ m|<td[^]]*>([\d\.]+)%\s*\(([\d\.]+)/([\d\.]+)\)</TD></TR>|i);
die "Malformed $html_file: $summaryTable" unless defined($pct);
push(@{$status_log_ref}, qq'<varz name="emma.pct" value="$pct"/>');
Index: src/com/google/caja/lang/css/CssPropertyPatterns.java
===================================================================
--- src/com/google/caja/lang/css/CssPropertyPatterns.java (revision 3869)
+++ src/com/google/caja/lang/css/CssPropertyPatterns.java (working copy)
@@ -150,7 +150,7 @@
private final CssSchema schema;
/**
- * Set of properties accessible on computed style of an anchor (<A>)
element
+ * Set of properties accessible on computed style of an anchor
(<A>) element
* or some element nested within an anchor. This list is a conservative
one
* based on the ability to do visibility, containment, and layout
* calculations. It REQUIRES that user CSS is prevented from specifying
ANY