dm prints out number of matching skp files

dm/DM.cpp

 // Main binary for DM.
 // For a high-level overview, please see dm/README.
 
 #include "CrashHandler.h"
 #include "SkCommonFlags.h"
 #include "SkForceLinking.h"
 #include "SkGraphics.h"
 #include "SkPicture.h"
 #include "SkString.h"
 #include "Test.h"
@@ skipping 101 matching lines @@
     for (int i = 0; i < tests.count(); i++) {
         SkAutoTDelete<Test> test(tests[i](NULL));
         if (test->isGPUTest()) {
             tasks->add(SkNEW_ARGS(DM::GpuTestTask, (reporter, tasks, tests[i])));
         } else {
             tasks->add(SkNEW_ARGS(DM::CpuTestTask, (reporter, tasks, tests[i])));
         }
     }
 }
 
-static void kick_off_skps(DM::Reporter* reporter, DM::TaskRunner* tasks) {
+static void find_skps(SkTArray<SkString>* skps) {
     if (FLAGS_skps.isEmpty()) {
         return;
     }
 
     SkOSFile::Iter it(FLAGS_skps[0], ".skp");
     SkString filename;
     while (it.next(&filename)) {
-        if (SkCommandLineFlags::ShouldSkip(FLAGS_match, filename.c_str())) {
-            continue;
+        if (!SkCommandLineFlags::ShouldSkip(FLAGS_match, filename.c_str())) {
+            skps->push_back(
+                    SkOSPath::SkPathJoin(FLAGS_skps[0], filename.c_str()));
         }
+    }
+}
 
-        const SkString path = SkOSPath::SkPathJoin(FLAGS_skps[0], filename.c_str());
-
-        SkAutoTDelete<SkStream> stream(SkStream::NewFromFile(path.c_str()));
+static void kick_off_skps(const SkTArray<SkString>& skps,
+                          DM::Reporter* reporter, DM::TaskRunner* tasks) {
+    for (int i = 0; i < skps.count(); ++i) {
+        SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(skps[i].c_str()));
         if (stream.get() == NULL) {
-            SkDebugf("Could not read %s.\n", path.c_str());
+            SkDebugf("Could not read %s.\n", skps[i].c_str());
             exit(1);
         }
         SkAutoTUnref<SkPicture> pic(SkPicture::CreateFromStream(stream.get()));
         if (pic.get() == NULL) {
-            SkDebugf("Could not read %s as an SkPicture.\n", path.c_str());
+            SkDebugf("Could not read %s as an SkPicture.\n", skps[i].c_str());
             exit(1);
         }
 
+        SkString filename = SkOSPath::SkBasename(skps[i].c_str());
         tasks->add(SkNEW_ARGS(DM::SKPTask, (reporter, tasks, pic, filename)));
         tasks->add(SkNEW_ARGS(DM::PDFTask, (reporter, tasks, pic, filename,
                                             RASTERIZE_PDF_PROC)));
     }
 }
 
 static void report_failures(const SkTArray<SkString>& failures) {
     if (failures.count() == 0) {
         return;
     }
@@ skipping 57 matching lines @@
                 expectations.reset(SkNEW_ARGS(DM::JsonExpectations, (path)));
             }
         }
     }
 
     SkTDArray<TestRegistry::Factory> tests;
     if (FLAGS_tests) {
         append_matching_factories<Test>(TestRegistry::Head(), &tests);
     }
 
-    SkDebugf("%d GMs x %d configs, %d tests\n",
-             gms.count(), configs.count(), tests.count());
+    SkTArray<SkString> skps;
+    find_skps(&skps);
+
+    SkDebugf("%d GMs x %d configs, %d tests, %d pictures\n",
+             gms.count(), configs.count(), tests.count(), skps.count());
     DM::Reporter reporter;
     DM::TaskRunner tasks(FLAGS_threads, FLAGS_gpuThreads);
     kick_off_gms(gms, configs, gpuAPI, *expectations, &reporter, &tasks);
     kick_off_tests(tests, &reporter, &tasks);
-    kick_off_skps(&reporter, &tasks);
+    kick_off_skps(skps, &reporter, &tasks);
     tasks.wait();
 
     SkDebugf("\n");
 
     SkTArray<SkString> failures;
     reporter.getFailures(&failures);
     report_failures(failures);
     return failures.count() > 0;
 }
 
 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL)
 int main(int argc, char** argv) {
     SkCommandLineFlags::Parse(argc, argv);
     return dm_main();
 }
 #endif