Revision: 3874
Author: jasvir
Date: Mon Nov 30 17:52:22 2009
Log: Fix the continuous build
http://codereview.appspot.com/164048
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
[email protected]
http://code.google.com/p/google-caja/source/detail?r=3874
Modified:
/trunk/src/com/google/caja/lang/css/CssPropertyPatterns.java
/trunk/tools/dashboard/dashboard.pl
=======================================
--- /trunk/src/com/google/caja/lang/css/CssPropertyPatterns.java Thu Oct 15
15:42:13 2009
+++ /trunk/src/com/google/caja/lang/css/CssPropertyPatterns.java Mon Nov 30
17:52:22 2009
@@ -150,13 +150,14 @@
private final CssSchema schema;
/**
- * 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
- * of these properties in a history sensitive manner (i.e., in a rule
with
- * a ":link" or ":visited" predicate). Otherwise, it would allow an
attacker
- * to probe the user's history as described at
+ * 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 of these properties in a history
+ * sensitive manner (i.e., in a rule with a ":link" or ":visited"
+ * predicate). Otherwise, it would allow an attacker to probe the
+ * user's history as described at
* https://bugzilla.mozilla.org/show_bug.cgi?id=147777 .
*/
public static Set<Name> HISTORY_INSENSITIVE_STYLE_WHITELIST
=======================================
--- /trunk/tools/dashboard/dashboard.pl Thu Jul 30 17:52:55 2009
+++ /trunk/tools/dashboard/dashboard.pl Mon Nov 30 17:52:22 2009
@@ -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"/>');