diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-25 15:02:57 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-25 15:02:57 +0000 |
| commit | cdd3620ac5ac76e30daaeb2c6fe75fa03083b5b5 (patch) | |
| tree | ace77ad9d4684f9b39b12d88eeb9f97eb908eae9 /dm | |
| parent | 7edad87cdcb15e3d7f04cd3394047e3b82dfa355 (diff) | |
DM: move --match check earlier to fix the "N GMs x M configs" log line.
BUG=
R=bsalomon@google.com
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/44443002
git-svn-id: http://skia.googlecode.com/svn/trunk@11963 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'dm')
| -rw-r--r-- | dm/DM.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -84,9 +84,6 @@ static void kick_off_tasks(const SkTDArray<GMRegistry::Factory>& gms, #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, \ @@ -142,7 +139,10 @@ int tool_main(int argc, char** argv) { 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()); |