share dm and command flags

dm/DM.cpp

 // Main binary for DM.
 // For a high-level overview, please see dm/README.
 
 #include "Benchmark.h"
 #include "CrashHandler.h"
-#include "SkCommandLineFlags.h"
+#include "SkCommonFlags.h"
 #include "SkForceLinking.h"
 #include "SkGraphics.h"
 #include "SkPicture.h"
 #include "SkString.h"
 #include "Test.h"
 #include "gm.h"
 
 #include "DMBenchTask.h"
 #include "DMCpuGMTask.h"
 #include "DMGpuGMTask.h"
@@ skipping 16 matching lines @@
 #include <ctype.h>
 
 using skiagm::GM;
 using skiagm::GMRegistry;
 using skiatest::Test;
 using skiatest::TestRegistry;
 
 static const char kGpuAPINameGL[] = "gl";
 static const char kGpuAPINameGLES[] = "gles";
 
-DEFINE_int32(threads, -1, "Threads for CPU work. Default NUM_CPUS.");
 DEFINE_int32(gpuThreads, 1, "Threads for GPU work.");
 DEFINE_string(gpuAPI, "", "Force use of specific gpu API.  Using \"gl\" "
               "forces OpenGL API. Using \"gles\" forces OpenGL ES API. "
               "Defaults to empty string, which selects the API native to the "
               "system.");
 DEFINE_string2(expectations, r, "",
                "If a directory, compare generated images against images under this path. "
                "If a file, compare generated images against JSON expectations at this path."
 );
-DEFINE_string2(resources, i, "resources", "Path to resources directory.");
-DEFINE_string(match, "",  "[~][^]substring[$] [...] of GM name to run.\n"
-                          "Multiple matches may be separated by spaces.\n"
-                          "~ causes a matching GM to always be skipped\n"
-                          "^ requires the start of the GM to match\n"
-                          "$ requires the end of the GM to match\n"
-                          "^ and $ requires an exact match\n"
-                          "If a GM does not match any list entry,\n"
-                          "it is skipped unless some list entry starts with ~");
+
 DEFINE_string(config, "565 8888 pdf gpu nonrendering",
               "Options: 565 8888 pdf gpu nonrendering msaa4 msaa16 nvprmsaa4 nvprmsaa16 "
               "gpunull gpudebug angle mesa");
-DEFINE_bool(dryRun, false,
-            "Just print the tests that would be run, without actually running them.");
-DEFINE_bool(leaks, false, "Print leaked instance-counted objects at exit?");
 DEFINE_string(skps, "", "Directory to read skps from.");
 
 DEFINE_bool(gms, true, "Run GMs?");
 DEFINE_bool(benches, true, "Run benches?  Does not run GMs-as-benches.");
 DEFINE_bool(tests, true, "Run tests?");
 
-DECLARE_bool(verbose);
-
 __SK_FORCE_IMAGE_DECODER_LINKING;
 
 // "FooBar" -> "foobar".  Obviously, ASCII only.
 static SkString lowercase(SkString s) {
     for (size_t i = 0; i < s.size(); i++) {
         s[i] = tolower(s[i]);
     }
     return s;
 }
 
@@ skipping 141 matching lines @@
 template <typename T, typename Registry>
 static void append_matching_factories(Registry* head, SkTDArray<typename Registry::Factory>* out) {
     for (const Registry* reg = head; reg != NULL; reg = reg->next()) {
         SkAutoTDelete<T> forName(reg->factory()(NULL));
         if (!SkCommandLineFlags::ShouldSkip(FLAGS_match, forName->getName())) {
             *out->append() = reg->factory();
         }
     }
 }
 
-int tool_main(int argc, char** argv);
-int tool_main(int argc, char** argv) {
+int dm_main(int argc, char** argv);
+int dm_main(int argc, char** argv) {

[scroggo, 2014/07/14 13:24:16]

argc and argv are no longer used.

[caryclark, 2014/07/14 15:07:12]

Done.

     SetupCrashHandler();
     SkAutoGraphics ag;
-    SkCommandLineFlags::Parse(argc, argv);
 
     if (FLAGS_dryRun) {
         FLAGS_verbose = true;
     }
 #if SK_ENABLE_INST_COUNT
     gPrintInstCount = FLAGS_leaks;
 #endif
 
     SkTArray<SkString> configs;
     for (int i = 0; i < FLAGS_config.count(); i++) {
@@ skipping 40 matching lines @@
     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) {
-    return tool_main(argc, argv);
+    SkCommandLineFlags::Parse(argc, argv);
+    return dm_main(argc, argv);
 }
 #endif