DM: failure to canary a sink is now fatal.

tools/flags/SkCommonFlags.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCommonFlags.h"
 
-DEFINE_string(config, "565 8888 gpu nonrendering angle nvprmsaa4 hwui ",
+DEFINE_string(config, "565 8888 gpu nonrendering angle hwui ",
               "Options: 565 8888 pdf gpu nonrendering msaa4 msaa16 nvprmsaa4 nvprmsaa16 "
               "gpudft gpunull gpudebug angle mesa (and many more)");
 
 DEFINE_bool(cpu, true, "master switch for running CPU-bound work.");
 
 DEFINE_bool(dryRun, false,
             "just print the tests that would be run, without actually running them.");
 
 DEFINE_bool(gpu, true, "master switch for running GPU-bound work.");
 
@@ skipping 31 matching lines @@
 
 DEFINE_bool2(veryVerbose, V, false, "tell individual tests to be verbose.");
 
 DEFINE_string2(writePath, w, "", "If set, write bitmaps here as .pngs.");
 
 DEFINE_string(key, "",
               "Space-separated key/value pairs to add to JSON identifying this builder.");
 DEFINE_string(properties, "",
               "Space-separated key/value pairs to add to JSON identifying this run.");