Preprend Test to test function name generated by DEF_TEST() macro.

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
 
@@ skipping 120 matching lines @@
     } while(0)
 
 #define ERRORF(reporter, ...)                       \
     do {                                            \
         SkString desc;                              \
         desc.printf("%s:%d\t", __FILE__, __LINE__); \
         desc.appendf(__VA_ARGS__) ;                 \
         (reporter)->reportFailed(desc);             \
     } while(0)
 
-#define DEF_TEST(name, reporter)                                   \
-    static void 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 {       \
-            name->set(#name);                                      \
-        }                                                          \
-        virtual void onRun(Reporter* r) SK_OVERRIDE { name(r); }   \
-    };                                                             \
-    static TestRegistry gReg_##name##Class(name##Class::Factory);  \
-    }                                                              \
-    static void name(skiatest::Reporter* reporter)
+#define DEF_TEST(name, reporter)                                       \
+    static void Test##name(skiatest::Reporter*);                       \

[mtklein, 2014/06/23 17:18:21]

Let's do test_##name to match the style guide for static functions?

[tfarina, 2014/06/23 22:47:32]

Done.

+    namespace skiatest {                                               \
+    class name##Class : public Test {                                  \
+    public:                                                            \
+        static Test* Factory(void*) { return SkNEW(name##Class); }     \
+    protected:                                                         \
+        virtual void onGetName(SkString* name) SK_OVERRIDE {           \
+            name->set(#name);                                          \
+        }                                                              \
+        virtual void onRun(Reporter* r) SK_OVERRIDE { Test##name(r); } \
+    };                                                                 \
+    static TestRegistry gReg_##name##Class(name##Class::Factory);      \
+    }                                                                  \
+    static void Test##name(skiatest::Reporter* reporter)
 
-#define DEF_GPUTEST(name, reporter, factory)                       \
-    static void name(skiatest::Reporter*, GrContextFactory*);      \
-    namespace skiatest {                                           \
-    class name##Class : public GpuTest {                           \
-    public:                                                        \
-        static Test* Factory(void*) { return SkNEW(name##Class); } \
-    protected:                                                     \
-        virtual void onGetName(SkString* name) SK_OVERRIDE {       \
-            name->set(#name);                                      \
-        }                                                          \
-        virtual void onRun(Reporter* r) SK_OVERRIDE {              \
-            name(r, fGrContextFactory);                            \
-        }                                                          \
-    };                                                             \
-    static TestRegistry gReg_##name##Class(name##Class::Factory);  \
-    }                                                              \
-    static void name(skiatest::Reporter* reporter, GrContextFactory* factory)
+#define DEF_GPUTEST(name, reporter, factory)                        \
+    static void Test##name(skiatest::Reporter*, GrContextFactory*); \
+    namespace skiatest {                                            \
+    class name##Class : public GpuTest {                            \
+    public:                                                         \
+        static Test* Factory(void*) { return SkNEW(name##Class); }  \
+    protected:                                                      \
+        virtual void onGetName(SkString* name) SK_OVERRIDE {        \
+            name->set(#name);                                       \
+        }                                                           \
+        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