Revert of Let DM run unit tests. (https://codereview.chromium.org/178273002/)
Reason for revert:
broke tests
Original issue's description:
> Let DM run unit tests.
> - refactor GYPs and a few flags
> - make GPU tests grab a thread-local GrContextFactory when needed as we do in DM for GMs
> - add a few more UI features to make DM more like tests
>
> I believe this makes the program 'tests' obsolete.
>
> It should be somewhat faster to run the two sets together than running the old binaries serially:
> - serial: tests 20s (3m18s CPU), dm 21s (3m01s CPU)
> - together: 27s (6m21s CPU)
>
> Next up is to incorporate benches. I'm only planning there on a single-pass sanity check, so that won't obsolete the program 'bench' just yet.
>
> Tested: out/Debug/tests && out/Debug/dm && echo ok
> BUG=skia:
>
> Committed: http://code.google.com/p/skia/source/detail?r=13586
R=bsalomon@google.com, mtklein@google.com, tfarina@chromium.org, mtklein@chromium.org
TBR=bsalomon@google.com, mtklein@chromium.org, mtklein@google.com, tfarina@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Author: reed@google.com
Review URL: https://codereview.chromium.org/179403010
git-svn-id: http://skia.googlecode.com/svn/trunk@13587 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/dm/DMReporter.cpp b/dm/DMReporter.cpp
index 1ff64c5..0fd83e5 100644
--- a/dm/DMReporter.cpp
+++ b/dm/DMReporter.cpp
@@ -3,27 +3,21 @@
#include "SkCommandLineFlags.h"
#include "OverwriteLine.h"
-DEFINE_bool2(quiet, q, false, "If true, don't print status updates.");
-DEFINE_bool2(verbose, v, false, "If true, print status updates one-per-line.");
+DEFINE_bool(quiet, false, "If true, don't print status updates.");
namespace DM {
-void Reporter::finish(SkString name) {
- sk_atomic_inc(&fFinished);
-
+void Reporter::updateStatusLine() const {
if (FLAGS_quiet) {
return;
}
SkString status;
- status.printf("%s%d tasks left",
- FLAGS_verbose ? "\n" : kSkOverwriteLine,
- this->started() - this->finished());
+ status.printf("%s%d tasks left", kSkOverwriteLine, this->started() - this->finished());
const int failed = this->failed();
if (failed > 0) {
status.appendf(", %d failed", failed);
}
- status.appendf("\t[%s done]", name.c_str());
SkDebugf(status.c_str());
}
@@ -32,9 +26,9 @@
return fFailures.count();
}
-void Reporter::fail(SkString msg) {
+void Reporter::fail(SkString name) {
SkAutoMutexAcquire writer(&fMutex);
- fFailures.push_back(msg);
+ fFailures.push_back(name);
}
void Reporter::getFailures(SkTArray<SkString>* failures) const {