Also proxy bumpTestCount.

tests/Test.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "Test.h"
 
 #include "SkString.h"
@@ skipping 42 matching lines @@
 const char* Test::getName() {
     if (fName.size() == 0) {
         this->onGetName(&fName);
     }
     return fName.c_str();
 }
 
 namespace {
     class LocalReporter : public Reporter {
     public:
-        explicit LocalReporter(const Reporter& reporterToMimic) : fReporter(reporterToMimic) {}
+        explicit LocalReporter(Reporter* reporterToMimic) : fReporter(reporterToMimic) {}
 
         int failure_size() const { return fFailures.count(); }
         const char* failure(int i) const { return fFailures[i].c_str(); }
 
     protected:
         void onReport(const char desc[], Result result) SK_OVERRIDE {
             if (kFailed == result) {
                 fFailures.push_back().set(desc);
             }
         }
 
+        // Proxy down to fReporter.  We assume these calls are threadsafe.
         virtual bool allowExtendedTest() const SK_OVERRIDE {
-            return fReporter.allowExtendedTest();
+            return fReporter->allowExtendedTest();
         }
 
         virtual bool allowThreaded() const SK_OVERRIDE {
-            return fReporter.allowThreaded();
+            return fReporter->allowThreaded();
+        }
+
+        virtual void bumpTestCount() SK_OVERRIDE {
+            fReporter->bumpTestCount();
         }
 
     private:
-        const Reporter& fReporter;
+        Reporter* fReporter;  // Unowned.
         SkTArray<SkString> fFailures;
     };
 }  // namespace
 
 void Test::run() {
     // 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(*fReporter);
+    LocalReporter local(fReporter);
     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++) {
       fReporter->report(local.failure(i), Reporter::kFailed);
     }
     fReporter->endTest(this);
 }
@@ skipping 11 matching lines @@
 #else
     return NULL;
 #endif
 }
 
 void GpuTest::DestroyContexts() {
 #if SK_SUPPORT_GPU
     gGrContextFactory.destroyContexts();
 #endif
 }