Make it clearer what's going on at the end of tests.
BUG=
R=reed@google.com
Author: mtklein@google.com
Review URL: https://chromiumcodereview.appspot.com/14267022
git-svn-id: http://skia.googlecode.com/svn/trunk@8803 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tests/Test.cpp b/tests/Test.cpp
index 408e14f..81c4ef9 100644
--- a/tests/Test.cpp
+++ b/tests/Test.cpp
@@ -9,6 +9,7 @@
#include "SkString.h"
#include "SkTArray.h"
+#include "SkTime.h"
#if SK_SUPPORT_GPU
#include "GrContext.h"
@@ -80,11 +81,13 @@
// Tell (likely shared) fReporter that this test has started.
fReporter->startTest(this);
+ const SkMSec start = SkTime::GetMSecs();
// Run the test into a LocalReporter so we know if it's passed or failed without interference
// from other tests that might share fReporter.
LocalReporter local;
this->onRun(&local);
fPassed = local.failure_size() == 0;
+ fElapsed = SkTime::GetMSecs() - start;
// Now tell fReporter about any failures and wrap up.
for (int i = 0; i < local.failure_size(); i++) {
diff --git a/tests/Test.h b/tests/Test.h
index 1aa0387..a4baf5b 100644
--- a/tests/Test.h
+++ b/tests/Test.h
@@ -12,6 +12,7 @@
#include "SkString.h"
#include "SkTRegistry.h"
#include "SkThread.h"
+#include "SkTypes.h"
class GrContextFactory;
@@ -70,6 +71,7 @@
const char* getName();
void run();
bool passed() const { return fPassed; }
+ SkMSec elapsedMs() const { return fElapsed; }
static const SkString& GetTmpDir();
@@ -85,6 +87,7 @@
Reporter* fReporter;
SkString fName;
bool fPassed;
+ SkMSec fElapsed;
};
class GpuTest : public Test{
diff --git a/tests/skia_test.cpp b/tests/skia_test.cpp
index 20527b0..7db5e5c 100644
--- a/tests/skia_test.cpp
+++ b/tests/skia_test.cpp
@@ -7,12 +7,13 @@
#include "SkCommandLineFlags.h"
#include "SkGraphics.h"
+#include "SkOSFile.h"
#include "SkRunnable.h"
-#include "SkThreadPool.h"
#include "SkTArray.h"
#include "SkTemplates.h"
+#include "SkThreadPool.h"
+#include "SkTime.h"
#include "Test.h"
-#include "SkOSFile.h"
#if SK_SUPPORT_GPU
#include "GrContext.h"
@@ -27,6 +28,10 @@
public:
Iter(Reporter* r) : fReporter(r) {
r->ref();
+ this->reset();
+ }
+
+ void reset() {
fReg = TestRegistry::Head();
}
@@ -45,16 +50,6 @@
return NULL;
}
- static int Count() {
- const TestRegistry* reg = TestRegistry::Head();
- int count = 0;
- while (reg) {
- count += 1;
- reg = reg->next();
- }
- return count;
- }
-
private:
Reporter* fReporter;
const TestRegistry* fReg;
@@ -68,6 +63,7 @@
public:
DebugfReporter(bool allowExtendedTest, bool allowThreaded)
: fNextIndex(0)
+ , fPending(0)
, fTotal(0)
, fAllowExtendedTest(allowExtendedTest)
, fAllowThreaded(allowThreaded) {
@@ -88,7 +84,8 @@
protected:
virtual void onStart(Test* test) {
const int index = sk_atomic_inc(&fNextIndex);
- SkDebugf("[%d/%d] %s...\n", index+1, fTotal, test->getName());
+ sk_atomic_inc(&fPending);
+ SkDebugf("[%3d/%3d] (%d) %s\n", index+1, fTotal, fPending, test->getName());
}
virtual void onReport(const char desc[], Reporter::Result result) {
SkDebugf("\t%s: %s\n", result2string(result), desc);
@@ -96,12 +93,20 @@
virtual void onEnd(Test* test) {
if (!test->passed()) {
- SkDebugf("---- FAILED\n");
+ SkDebugf("---- %s FAILED\n", test->getName());
+ }
+
+ sk_atomic_dec(&fPending);
+ if (fNextIndex == fTotal) {
+ // Just waiting on straggler tests. Shame them by printing their name and runtime.
+ SkDebugf(" (%d) %5.1fs %s\n",
+ fPending, test->elapsedMs() / 1e3, test->getName());
}
}
private:
int32_t fNextIndex;
+ int32_t fPending;
int fTotal;
bool fAllowExtendedTest;
bool fAllowThreaded;
@@ -163,6 +168,10 @@
int32_t* fFailCount;
};
+static bool shouldSkip(const char* testName) {
+ return !FLAGS_match.isEmpty() && !strstr(testName, FLAGS_match[0]);
+}
+
int tool_main(int argc, char** argv);
int tool_main(int argc, char** argv) {
SkCommandLineFlags::SetUsage("");
@@ -208,16 +217,29 @@
DebugfReporter reporter(FLAGS_extendedTest, FLAGS_threaded);
Iter iter(&reporter);
- const int count = Iter::Count();
- reporter.setTotal(count);
+ // Count tests first.
+ int total = 0;
+ int toRun = 0;
+ Test* test;
+ while ((test = iter.next()) != NULL) {
+ SkAutoTDelete<Test> owned(test);
+ if(!shouldSkip(test->getName())) {
+ toRun++;
+ }
+ total++;
+ }
+ reporter.setTotal(toRun);
+
+ // Now run them.
+ iter.reset();
int32_t failCount = 0;
int skipCount = 0;
SkAutoTDelete<SkThreadPool> threadpool(SkNEW_ARGS(SkThreadPool, (FLAGS_threads)));
SkTArray<Test*> unsafeTests; // Always passes ownership to an SkTestRunnable
- for (int i = 0; i < count; i++) {
+ for (int i = 0; i < total; i++) {
SkAutoTDelete<Test> test(iter.next());
- if (!FLAGS_match.isEmpty() && !strstr(test->getName(), FLAGS_match[0])) {
+ if (shouldSkip(test->getName())) {
++skipCount;
} else if (!test->isThreadsafe()) {
unsafeTests.push_back() = test.detach();
@@ -235,7 +257,7 @@
threadpool.free();
SkDebugf("Finished %d tests, %d failures, %d skipped.\n",
- count, failCount, skipCount);
+ toRun, failCount, skipCount);
const int testCount = reporter.countTests();
if (FLAGS_verbose && testCount > 0) {
SkDebugf("Ran %d Internal tests.\n", testCount);