diff options
Diffstat (limited to 'dm')
-rw-r--r-- | dm/DMJsonWriter.cpp | 21 | ||||
-rw-r--r-- | dm/DMJsonWriter.h | 6 | ||||
-rw-r--r-- | dm/DMTestTask.h | 13 |
3 files changed, 38 insertions, 2 deletions
diff --git a/dm/DMJsonWriter.cpp b/dm/DMJsonWriter.cpp index f86264715b..a2de38bb31 100644 --- a/dm/DMJsonWriter.cpp +++ b/dm/DMJsonWriter.cpp @@ -24,6 +24,14 @@ void JsonWriter::AddBitmapResult(const BitmapResult& result) { gBitmapResults.push_back(result); } +SkTArray<skiatest::Failure> gFailures; +SK_DECLARE_STATIC_MUTEX(gFailureLock); + +void JsonWriter::AddTestFailure(const skiatest::Failure& failure) { + SkAutoMutexAcquire lock(gFailureLock); + gFailures.push_back(failure); +} + void JsonWriter::DumpJson() { if (FLAGS_writePath.isEmpty()) { return; @@ -52,6 +60,19 @@ void JsonWriter::DumpJson() { } } + { + SkAutoMutexAcquire lock(gFailureLock); + for (int i = 0; i < gFailures.count(); i++) { + Json::Value result; + result["file_name"] = gFailures[i].fileName; + result["line_no"] = gFailures[i].lineNo; + result["condition"] = gFailures[i].condition; + result["message"] = gFailures[i].message.c_str(); + + root["test_results"]["failures"].append(result); + } + } + SkString path = SkOSPath::Join(FLAGS_writePath[0], "dm.json"); SkFILEWStream stream(path.c_str()); stream.writeText(Json::StyledWriter().write(root).c_str()); diff --git a/dm/DMJsonWriter.h b/dm/DMJsonWriter.h index c358fdd923..66ce530624 100644 --- a/dm/DMJsonWriter.h +++ b/dm/DMJsonWriter.h @@ -9,6 +9,7 @@ #define DMJsonWriter_DEFINED #include "SkString.h" +#include "Test.h" namespace DM { @@ -35,6 +36,11 @@ public: static void AddBitmapResult(const BitmapResult&); /** + * Add a Failure from a Test. + */ + static void AddTestFailure(const skiatest::Failure&); + + /** * Write all collected results to the file FLAGS_writePath[0]/dm.json. */ static void DumpJson(); diff --git a/dm/DMTestTask.h b/dm/DMTestTask.h index ceb0e12e96..9a47b35f60 100644 --- a/dm/DMTestTask.h +++ b/dm/DMTestTask.h @@ -2,6 +2,7 @@ #define DMTestTask_DEFINED #include "DMReporter.h" +#include "DMJsonWriter.h" #include "DMTask.h" #include "DMTaskRunner.h" #include "SkString.h" @@ -21,8 +22,16 @@ private: virtual bool allowExtendedTest() const SK_OVERRIDE; virtual bool verbose() const SK_OVERRIDE; - virtual void onReportFailed(const SkString& desc) SK_OVERRIDE { - fFailure = desc; + virtual void onReportFailed(const skiatest::Failure& failure) SK_OVERRIDE { + JsonWriter::AddTestFailure(failure); + + SkString newFailure; + failure.getFailureString(&newFailure); + // TODO: Better to store an array of failures? + if (!fFailure.isEmpty()) { + fFailure.append("\n\t\t"); + } + fFailure.append(newFailure); } SkString fFailure; |