DM: move --match check earlier to fix the "N GMs x M configs" log line.

dm/DM.cpp

 // Main binary for DM.
 // For a high-level overview, please see dm/README.
 
 #include "GrContext.h"
 #include "GrContextFactory.h"
 #include "SkCommandLineFlags.h"
 #include "SkForceLinking.h"
 #include "SkGraphics.h"
 #include "gm.h"
 
@@ skipping 66 matching lines @@
         native;
     #endif
     const GrContextFactory::GLContextType mesa   =
     #if SK_MESA
         GLContextFactory::kMESA_GLContextType;
     #else
         native;
     #endif
 
     for (int i = 0; i < gms.count(); i++) {
-        SkAutoTDelete<GM> gmForName(gms[i](NULL));
-        if (SkCommandLineFlags::ShouldSkip(FLAGS_match, gmForName->shortName())) continue;
-
 #define START(name, type, ...)                                                     \
     if (lowercase(configs[j]).equals(name)) {                                      \
         tasks->add(SkNEW_ARGS(DM::type,                                            \
                     (name, reporter, tasks, expectations, gms[i], __VA_ARGS__)));  \
     }
         for (int j = 0; j < configs.count(); j++) {
             START("565",      CpuTask, _565);
             START("8888",     CpuTask, _8888);
             START("gpu",      GpuTask, _8888, native, 0);
             START("msaa4",    GpuTask, _8888, native, 4);
@@ skipping 35 matching lines @@
 
     SkCommandLineFlags::Parse(argc, argv);
     GM::SetResourcePath(FLAGS_resources[0]);
     SkTArray<SkString> configs;
     for (int i = 0; i < FLAGS_config.count(); i++) {
         split(FLAGS_config[i], ", ", &configs);
     }
 
     SkTDArray<GMRegistry::Factory> gms;
     for (const GMRegistry* reg = GMRegistry::Head(); reg != NULL; reg = reg->next()) {
-        *gms.append() = reg->factory();
+        SkAutoTDelete<GM> gmForName(reg->factory()(NULL));
+        if (!SkCommandLineFlags::ShouldSkip(FLAGS_match, gmForName->shortName())) {
+            *gms.append() = reg->factory();
+        }
     }
     SkDebugf("%d GMs x %d configs\n", gms.count(), configs.count());
 
     SkAutoTUnref<ExpectationsSource> expectations(SkNEW(NoExpectations));
     if (FLAGS_expectations.count() > 0) {
         expectations.reset(SkNEW_ARGS(JsonExpectationsSource, (FLAGS_expectations[0])));
     }
 
     DM::Reporter reporter;
     DM::TaskRunner tasks(FLAGS_cpuThreads, FLAGS_gpuThreads);
     kick_off_tasks(gms, configs, *expectations, &reporter, &tasks);
     tasks.wait();
 
     reporter.updateStatusLine();
     SkDebugf("\n");
     report_failures(reporter);
 
     SkGraphics::Term();
 
     return reporter.failed() > 0;
 }
 
 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL)
 int main(int argc, char** argv) {
     return tool_main(argc, argv);
 }
 #endif