Unbreak -z. The LocalReporter shim layer was forcing the pathops options back to...

BUG=
R=caryclark@google.com

Author: mtklein@google.com

Review URL: https://chromiumcodereview.appspot.com/13849013

git-svn-id: http://skia.googlecode.com/svn/trunk@8804 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/tests/Test.cpp b/tests/Test.cpp
index 81c4ef980787d4d346115789b0f36b261fbe66cb..07db96953e7bc01a2603c5adf65c7d44e386a5d1 100644 (file)
--- a/tests/Test.cpp
+++ b/tests/Test.cpp
@@ -60,7 +60,7 @@ const char* Test::getName() {
 namespace {
     class LocalReporter : public Reporter {
     public:
-        LocalReporter() {}
+        explicit LocalReporter(const Reporter& reporterToMimic) : fReporter(reporterToMimic) {}
 
         int failure_size() const { return fFailures.count(); }
         const char* failure(int i) const { return fFailures[i].c_str(); }
@@ -72,7 +72,16 @@ namespace {
             }
         }
 
+        virtual bool allowExtendedTest() const SK_OVERRIDE {
+            return fReporter.allowExtendedTest();
+        }
+
+        virtual bool allowThreaded() const SK_OVERRIDE {
+            return fReporter.allowThreaded();
+        }
+
     private:
+        const Reporter& fReporter;
         SkTArray<SkString> fFailures;
     };
 }  // namespace
@@ -84,7 +93,7 @@ void Test::run() {
     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;
+    LocalReporter local(*fReporter);
     this->onRun(&local);
     fPassed = local.failure_size() == 0;
     fElapsed = SkTime::GetMSecs() - start;

diff --git a/tests/skia_test.cpp b/tests/skia_test.cpp
index 7db5e5ccc3dec2b14b0ae6e3bc573f18a491282d..516ab7effbcc0e20a53be963a0435f13920986d2 100644 (file)
--- a/tests/skia_test.cpp
+++ b/tests/skia_test.cpp
@@ -73,11 +73,11 @@ public:
         fTotal = total;
     }
 
-    virtual bool allowExtendedTest() const {
+    virtual bool allowExtendedTest() const SK_OVERRIDE {
         return fAllowExtendedTest;
     }
 
-    virtual bool allowThreaded() const {
+    virtual bool allowThreaded() const SK_OVERRIDE {
         return fAllowThreaded;
     }