When running DM, write test failures to json.

tests/Test.h

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #ifndef skiatest_Test_DEFINED
 #define skiatest_Test_DEFINED
 
 #include "SkRefCnt.h"
 #include "SkString.h"
 #include "SkTRegistry.h"
 #include "SkThread.h"
 #include "SkTypes.h"
 
 class GrContextFactory;
 
 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()) {
+                if (condition != NULL) {
+                    result->appendf("%s: %s", message.c_str(), condition);
+                } else {
+                    result->append(message);
+                }
+            } else if (condition != NULL) {
+                // Condition, but no message.
+                result->append(condition);
+            }
+        }
+    };
+
+
     class Reporter : public SkRefCnt {
     public:
         SK_DECLARE_INST_COUNT(Reporter)
         Reporter();
 
         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; }
         virtual bool verbose() const { return false; }
         virtual void bumpTestCount() { sk_atomic_inc(&fTestCount); }
 
     protected:
         virtual void onStart(Test*) {}
-        virtual void onReportFailed(const SkString& desc) {}
+        virtual void onReportFailed(const Failure&) {}
         virtual void onEnd(Test*) {}
 
     private:
         int32_t fTestCount;
 
         typedef SkRefCnt INHERITED;
     };
 
     class Test {
     public:
@@ skipping 52 matching lines @@
         REPORTER_ASSERT_MESSAGE(reporter, x == 15, "x should be 15");
         ...
         if (x != 15) {
             ERRORF(reporter, "x should be 15, but is %d", x);
             return;
         }
         ...
     }
 */
 
-#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__,               \
+                                      NULL, SkString(desc) };           \

[mtklein, 2014/11/06 17:46:54]

Consider "" instead of NULL here, so we never have to worry about NULL checks?

[scroggo, 2014/11/06 20:29:32]

Done.

+        r->reportFailed(failure);                                       \
     } while(0)
 
 #define DEF_TEST(name, reporter)                                        \
     static void test_##name(skiatest::Reporter*);                       \
     namespace skiatest {                                                \
     class name##Class : public Test {                                   \
     public:                                                             \
         static Test* Factory(void*) { return SkNEW(name##Class); }      \
     protected:                                                          \
         virtual void onGetName(SkString* name) SK_OVERRIDE {            \
@@ skipping 17 matching lines @@
         }                                                             \
         virtual void onRun(Reporter* r) SK_OVERRIDE {                 \
             test_##name(r, fGrContextFactory);                        \
         }                                                             \
     };                                                                \
     static TestRegistry gReg_##name##Class(name##Class::Factory);     \
     }                                                                 \
     static void test_##name(skiatest::Reporter* reporter, GrContextFactory* factory)
 
 #endif