Image subsets as part of the name instead of a separate source type.

This will hold us closer to the principle that the test name (and only the test
name) should correspond to expected output.  By the same reasoning, mix in the
number of subsets: if that changes, the expected output also changes.

BUG=skia:3255

Review URL: https://codereview.chromium.org/863723002

1 files changed, 3 insertions, 3 deletions

diff --git a/dm/DM.cpp b/dm/DM.cpp
index 45d20b86f0..1f0145ec2c 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -15,7 +15,7 @@
 
 DEFINE_bool(tests, true, "Run tests?");
 DEFINE_string(images, "resources", "Images to decode.");
-DEFINE_string(src, "gm skp image subset", "Source types to test.");
+DEFINE_string(src, "gm skp image", "Source types to test.");
 DEFINE_bool(nameByHash, false,
             "If true, write to FLAGS_writePath[0]/<hash>.png instead of "
             "to FLAGS_writePath[0]/<config>/<sourceType>/<name>.png");
@@ -94,8 +94,8 @@ static void gather_srcs() {
             SkOSFile::Iter it(FLAGS_images[0], exts[i]);
             for (SkString file; it.next(&file); ) {
                 SkString path = SkOSPath::Join(FLAGS_images[0], file.c_str());
-                push_src("image",  new ImageSrc(path));     // Decode entire image.
-                push_src("subset", new ImageSrc(path, 5));  // Decode 5 random subsets.
+                push_src("image", new ImageSrc(path));     // Decode entire image.
+                push_src("image", new ImageSrc(path, 5));  // Decode 5 random subsets.
             }
         }
     }