de-common another batch of flags

These are only used by DM and nanobench,
and sometimes even do substantially different things...

Change-Id: I973f3938fbae1fd1b19d876fa6a90122fc55d48c
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/203167
Auto-Submit: Mike Klein <mtklein@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
This commit is contained in:
Mike Klein 2019-03-22 14:55:19 -05:00 committed by Skia Commit-Bot
parent 1d0e68b839
commit 629f5fc5ec
5 changed files with 25 additions and 24 deletions

View File

@ -141,6 +141,16 @@ static DEFINE_bool(forceRasterPipeline, false, "sets gSkForceRasterPipelineBlitt
static DEFINE_bool2(pre_log, p, false,
"Log before running each test. May be incomprehensible when threading");
static DEFINE_bool(cpu, true, "master switch for running CPU-bound work.");
static DEFINE_bool(gpu, true, "master switch for running GPU-bound work.");
static DEFINE_bool(dryRun, false,
"just print the tests that would be run, without actually running them.");
static DEFINE_string(images, "",
"List of images and/or directories to decode. A directory with no images"
" is treated as a fatal error.");
static DEFINE_bool(simpleCodec, false,
"Runs of a subset of the codec tests, always N32, Premul or Opaque");
static double now_ms() { return SkTime::GetNSecs() * 1e-6; }
static SkString humanize(double ms) {

View File

@ -108,6 +108,19 @@ static DEFINE_string(colorImages, "",
static DEFINE_bool2(veryVerbose, V, false, "tell individual tests to be verbose.");
static DEFINE_bool(cpu, true, "master switch for running CPU-bound work.");
static DEFINE_bool(gpu, true, "master switch for running GPU-bound work.");
static DEFINE_bool(dryRun, false,
"just print the tests that would be run, without actually running them.");
static DEFINE_string(images, "",
"List of images and/or directories to decode. A directory with no images"
" is treated as a fatal error.");
static DEFINE_bool(simpleCodec, false,
"Runs of a subset of the codec tests, "
"with no scaling or subsetting, always using the canvas color type.");
using namespace DM;
using sk_gpu_test::GrContextFactory;

View File

@ -31,6 +31,8 @@ static DEFINE_bool2(runFail, f, false, "check for success on tests known to fail
static DEFINE_bool2(verifyOp, y, false, "compare the pathOps result against a region.");
static DEFINE_string2(json, J, "", "write json version of tests.");
static DEFINE_bool2(veryVerbose, V, false, "tell individual tests to be verbose.");
static DEFINE_bool(cpu, true, "master switch for running CPU-bound work.");
static DEFINE_bool(gpu, true, "master switch for running GPU-bound work.");
#if DEBUG_COIN
static DEFINE_bool2(coinTest, c, false, "detect unused coincidence algorithms.");

View File

@ -13,25 +13,6 @@
#include "SkOnce.h"
#include "SkScan.h"
DEFINE_bool(cpu, true, "master switch for running CPU-bound work.");
DEFINE_bool(dryRun,
false,
"just print the tests that would be run, without actually running them.");
DEFINE_bool(gpu, true, "master switch for running GPU-bound work.");
DEFINE_string(images,
"",
"List of images and/or directories to decode. A directory with no images"
" is treated as a fatal error.");
DEFINE_bool(simpleCodec,
false,
"Runs of a subset of the codec tests. "
"For DM, this means no scaling or subsetting, always using the "
"canvas color type. "
"For nanobench, this means always N32, Premul or Opaque.");
DEFINE_string2(match,
m,

View File

@ -12,11 +12,6 @@
#include "CommandLineFlags.h"
#include "SkString.h"
DECLARE_bool(cpu);
DECLARE_bool(dryRun);
DECLARE_bool(gpu);
DECLARE_string(images);
DECLARE_bool(simpleCodec);
DECLARE_string(match);
DECLARE_bool(quiet);
DECLARE_string(skps);