aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar djsollen <djsollen@google.com>2015-06-12 12:06:22 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-06-12 12:06:22 -0700
commit824996aac96fdab1f326715782f354c104ec3204 (patch)
tree5a5026504c7055f8075eba2dbefa5f0fe56fdf73
parent1fe1858a90532f4db578bffb97936742d39ede49 (diff)
Update DM to respect blacklists for tests
-rw-r--r--dm/DM.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/dm/DM.cpp b/dm/DM.cpp
index 684ae8051e..af20a78368 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -674,9 +674,16 @@ static void run_test(skiatest::Test* test) {
}
bool verbose() const override { return FLAGS_veryVerbose; }
} reporter;
+
+ SkString note;
+ SkString whyBlacklisted = is_blacklisted("_", "tests", "_", test->name);
+ if (!whyBlacklisted.isEmpty()) {
+ note.appendf(" (--blacklist %s)", whyBlacklisted.c_str());
+ }
+
WallTimer timer;
timer.start();
- if (!FLAGS_dryRun) {
+ if (!FLAGS_dryRun && whyBlacklisted.isEmpty()) {
start("unit", "test", "", test->name);
GrContextFactory factory;
if (FLAGS_pre_log) {
@@ -685,7 +692,7 @@ static void run_test(skiatest::Test* test) {
test->proc(&reporter, &factory);
}
timer.end();
- done(timer.fWall, "unit", "test", "", test->name, "", "");
+ done(timer.fWall, "unit", "test", "", test->name, note, "");
}
/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/