When running DM, write test failures to json.

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 "SkCommandLineFlags.h"
@@ skipping 13 matching lines @@
 
 using namespace skiatest;
 
 Reporter::Reporter() : fTestCount(0) {
 }
 
 void Reporter::startTest(Test* test) {
     this->onStart(test);
 }
 
-void Reporter::reportFailed(const SkString& desc) {
-    this->onReportFailed(desc);
+void Reporter::reportFailed(const skiatest::Failure& failure) {
+    this->onReportFailed(failure);
 }
 
 void Reporter::endTest(Test* test) {
     this->onEnd(test);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 Test::Test() : fReporter(NULL), fPassed(true) {}
 
@@ skipping 10 matching lines @@
         this->onGetName(&fName);
     }
     return fName.c_str();
 }
 
 class LocalReporter : public Reporter {
 public:
     explicit LocalReporter(Reporter* reporterToMimic) : fReporter(reporterToMimic) {}
 
     int numFailures() const { return fFailures.count(); }
-    const SkString& failure(int i) const { return fFailures[i]; }
+    const skiatest::Failure& failure(int i) const { return fFailures[i]; }
 
 protected:
-    virtual void onReportFailed(const SkString& desc) SK_OVERRIDE {
-        fFailures.push_back(desc);
+    virtual void onReportFailed(const Failure& failure) SK_OVERRIDE {
+        fFailures.push_back(failure);
     }
 
     // Proxy down to fReporter.  We assume these calls are threadsafe.
     virtual bool allowExtendedTest() const SK_OVERRIDE {
         return fReporter->allowExtendedTest();
     }
 
     virtual void bumpTestCount() SK_OVERRIDE {
         fReporter->bumpTestCount();
     }
 
     virtual bool verbose() const SK_OVERRIDE {
         return fReporter->verbose();
     }
 
 private:
     Reporter* fReporter;  // Unowned.
-    SkTArray<SkString> fFailures;
+    SkTArray<skiatest::Failure> fFailures;
 };
 
 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);
 
@@ skipping 10 matching lines @@
       fReporter->reportFailed(local.failure(i));
     }
     fReporter->endTest(this);
 
 }
 
 SkString Test::GetTmpDir() {
     const char* tmpDir = FLAGS_tmpDir.isEmpty() ? NULL : FLAGS_tmpDir[0];
     return SkString(tmpDir);
 }