aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dm/DMJsonWriter.cpp21
-rw-r--r--dm/DMJsonWriter.h6
-rw-r--r--dm/DMTestTask.h13
-rw-r--r--tests/GrTRecorderTest.cpp2
-rw-r--r--tests/Test.cpp12
-rw-r--r--tests/Test.h80
-rw-r--r--tests/skia_test.cpp4
7 files changed, 105 insertions, 33 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;
diff --git a/tests/GrTRecorderTest.cpp b/tests/GrTRecorderTest.cpp
index a5aedf687c..83bc445b5f 100644
--- a/tests/GrTRecorderTest.cpp
+++ b/tests/GrTRecorderTest.cpp
@@ -214,7 +214,7 @@ static void test_subclasses(skiatest::Reporter* reporter) {
break;
default:
- reporter->reportFailed(SkString("Invalid class type"));
+ ERRORF(reporter, "Invalid class type");
break;
}
}
diff --git a/tests/Test.cpp b/tests/Test.cpp
index c458f897fb..acbc332936 100644
--- a/tests/Test.cpp
+++ b/tests/Test.cpp
@@ -31,8 +31,8 @@ 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) {
@@ -63,11 +63,11 @@ 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.
@@ -85,7 +85,7 @@ protected:
private:
Reporter* fReporter; // Unowned.
- SkTArray<SkString> fFailures;
+ SkTArray<skiatest::Failure> fFailures;
};
void Test::run() {
diff --git a/tests/Test.h b/tests/Test.h
index 6c85b32bce..90cd25998f 100644
--- a/tests/Test.h
+++ b/tests/Test.h
@@ -20,6 +20,40 @@ namespace skiatest {
class Test;
+ /**
+ * Information about a single failure from a Test.
+ *
+ * Not intended to be created/modified directly. To create one, use one of
+ *
+ * REPORTER_ASSERT
+ * REPORTER_ASSERT_MESSAGE
+ * ERRORF
+ *
+ * described in more detail further down in this file.
+ */
+ struct Failure {
+ const char* fileName;
+ int lineNo;
+ const char* condition;
+ SkString message;
+
+ // Helper to combine the failure info into one string.
+ void getFailureString(SkString* result) const {
+ if (!result) {
+ return;
+ }
+ result->printf("%s:%d\t", fileName, lineNo);
+ if (!message.isEmpty()) {
+ result->append(message);
+ if (strlen(condition) > 0) {
+ result->append(": ");
+ }
+ }
+ result->append(condition);
+ }
+ };
+
+
class Reporter : public SkRefCnt {
public:
SK_DECLARE_INST_COUNT(Reporter)
@@ -28,7 +62,7 @@ namespace skiatest {
int countTests() const { return fTestCount; }
void startTest(Test*);
- void reportFailed(const SkString& desc);
+ void reportFailed(const Failure&);
void endTest(Test*);
virtual bool allowExtendedTest() const { return false; }
@@ -37,7 +71,7 @@ namespace skiatest {
protected:
virtual void onStart(Test*) {}
- virtual void onReportFailed(const SkString& desc) {}
+ virtual void onReportFailed(const Failure&) {}
virtual void onEnd(Test*) {}
private:
@@ -110,31 +144,31 @@ namespace skiatest {
}
*/
-#define REPORTER_ASSERT(r, cond) \
- do { \
- if (!(cond)) { \
- SkString desc; \
- desc.printf("%s:%d\t%s", __FILE__, __LINE__, #cond); \
- r->reportFailed(desc); \
- } \
+#define REPORTER_ASSERT(r, cond) \
+ do { \
+ if (!(cond)) { \
+ skiatest::Failure failure = { __FILE__, __LINE__, \
+ #cond, SkString() }; \
+ r->reportFailed(failure); \
+ } \
} while(0)
-#define REPORTER_ASSERT_MESSAGE(r, cond, message) \
- do { \
- if (!(cond)) { \
- SkString desc; \
- desc.printf("%s:%d\t%s: %s", __FILE__, __LINE__, \
- message, #cond); \
- r->reportFailed(desc); \
- } \
+#define REPORTER_ASSERT_MESSAGE(r, cond, message) \
+ do { \
+ if (!(cond)) { \
+ skiatest::Failure failure = { __FILE__, __LINE__, \
+ #cond, SkString(message) }; \
+ r->reportFailed(failure); \
+ } \
} while(0)
-#define ERRORF(reporter, ...) \
- do { \
- SkString desc; \
- desc.printf("%s:%d\t", __FILE__, __LINE__); \
- desc.appendf(__VA_ARGS__) ; \
- (reporter)->reportFailed(desc); \
+#define ERRORF(r, ...) \
+ do { \
+ SkString desc; \
+ desc.appendf(__VA_ARGS__) ; \
+ skiatest::Failure failure = { __FILE__, __LINE__, \
+ "", SkString(desc) }; \
+ r->reportFailed(failure); \
} while(0)
#define DEF_TEST(name, reporter) \
diff --git a/tests/skia_test.cpp b/tests/skia_test.cpp
index 172328ee4a..3d76c3a095 100644
--- a/tests/skia_test.cpp
+++ b/tests/skia_test.cpp
@@ -58,7 +58,9 @@ public:
virtual bool verbose() const SK_OVERRIDE { return FLAGS_veryVerbose; }
protected:
- virtual void onReportFailed(const SkString& desc) SK_OVERRIDE {
+ virtual void onReportFailed(const skiatest::Failure& failure) SK_OVERRIDE {
+ SkString desc;
+ failure.getFailureString(&desc);
SkDebugf("\nFAILED: %s", desc.c_str());
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-19 17:06:15 +0000