Avoid side effects related to skia error callbacks in the testing infrastructure

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"
 #include "SkTArray.h"
 #include "SkTime.h"
+#include "SkError.h"
 
 #if SK_SUPPORT_GPU
 #include "GrContext.h"
 #include "gl/SkNativeGLContext.h"
 #else
 class GrContext;
 #endif
 
 SK_DEFINE_INST_COUNT(skiatest::Reporter)
 
@@ skipping 62 matching lines @@
             fReporter->bumpTestCount();
         }
 
     private:
         Reporter* fReporter;  // Unowned.
         SkTArray<SkString> fFailures;
     };
 }  // namespace
 
 void Test::run() {
+    // Clear the Skia error callback before running any test, to ensure that tests
+    // don't have unintended side effects when running more than one.
+    SkSetErrorCallback( NULL, NULL );
+
     // 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);
     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);
+
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #if SK_SUPPORT_GPU
 #include "GrContextFactory.h"
 GrContextFactory gGrContextFactory;
 #endif
 
 GrContextFactory* GpuTest::GetGrContextFactory() {
 #if SK_SUPPORT_GPU
     return &gGrContextFactory;
 #else
     return NULL;
 #endif
 }
 
 void GpuTest::DestroyContexts() {
 #if SK_SUPPORT_GPU
     gGrContextFactory.destroyContexts();
 #endif
 }