diff options
Diffstat (limited to 'tests/Test.h')
| -rw-r--r-- | tests/Test.h | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/tests/Test.h b/tests/Test.h index 119976f3ee..4b19a85c1d 100644 --- a/tests/Test.h +++ b/tests/Test.h @@ -11,11 +11,9 @@ #include "SkTRegistry.h" #include "SkTypes.h" -namespace sk_gpu_test { class GrContextFactory; -class GLContext; -} // namespace sk_gpu_test class GrContext; +class SkGLContext; namespace skiatest { @@ -43,7 +41,7 @@ public: #define REPORT_FAILURE(reporter, cond, message) \ reporter->reportFailed(skiatest::Failure(__FILE__, __LINE__, cond, message)) -typedef void (*TestProc)(skiatest::Reporter*, sk_gpu_test::GrContextFactory*); +typedef void (*TestProc)(skiatest::Reporter*, GrContextFactory*); struct Test { Test(const char* n, bool g, TestProc p) : name(n), needsGpu(g), proc(p) {} @@ -85,7 +83,7 @@ enum GPUTestContexts { }; template<typename T> void RunWithGPUTestContexts(T testFunction, GPUTestContexts contexts, Reporter* reporter, - sk_gpu_test::GrContextFactory* factory); + GrContextFactory* factory); /** Timer provides wall-clock duration since its creation. */ class Timer { @@ -135,32 +133,32 @@ private: } \ } while (0) -#define DEF_TEST(name, reporter) \ - static void test_##name(skiatest::Reporter*, sk_gpu_test::GrContextFactory*); \ - skiatest::TestRegistry name##TestRegistry( \ - skiatest::Test(#name, false, test_##name)); \ - void test_##name(skiatest::Reporter* reporter, sk_gpu_test::GrContextFactory*) +#define DEF_TEST(name, reporter) \ + static void test_##name(skiatest::Reporter*, GrContextFactory*); \ + skiatest::TestRegistry name##TestRegistry( \ + skiatest::Test(#name, false, test_##name)); \ + void test_##name(skiatest::Reporter* reporter, GrContextFactory*) #define GPUTEST_EXPAND_MSVC(x) x #define GPUTEST_APPLY(C, ...) GPUTEST_EXPAND_MSVC(C(__VA_ARGS__)) #define GPUTEST_SELECT(a1, a2, N, ...) N #define GPUTEST_CONTEXT_ARGS1(a1) GrContext* a1 -#define GPUTEST_CONTEXT_ARGS2(a1, a2) GrContext* a1, sk_gpu_test::GLContext* a2 +#define GPUTEST_CONTEXT_ARGS2(a1, a2) GrContext* a1, SkGLContext* a2 #define GPUTEST_CONTEXT_ARGS(...) \ GPUTEST_APPLY(GPUTEST_SELECT(__VA_ARGS__, GPUTEST_CONTEXT_ARGS2, GPUTEST_CONTEXT_ARGS1), \ __VA_ARGS__) -#define DEF_GPUTEST(name, reporter, factory) \ - static void test_##name(skiatest::Reporter*, sk_gpu_test::GrContextFactory*); \ - skiatest::TestRegistry name##TestRegistry( \ - skiatest::Test(#name, true, test_##name)); \ - void test_##name(skiatest::Reporter* reporter, sk_gpu_test::GrContextFactory* factory) +#define DEF_GPUTEST(name, reporter, factory) \ + static void test_##name(skiatest::Reporter*, GrContextFactory*); \ + skiatest::TestRegistry name##TestRegistry( \ + skiatest::Test(#name, true, test_##name)); \ + void test_##name(skiatest::Reporter* reporter, GrContextFactory* factory) #define DEF_GPUTEST_FOR_CONTEXTS(name, contexts, reporter, ...) \ static void test_##name(skiatest::Reporter*, GPUTEST_CONTEXT_ARGS(__VA_ARGS__)); \ static void test_gpu_contexts_##name(skiatest::Reporter* reporter, \ - sk_gpu_test::GrContextFactory* factory) { \ + GrContextFactory* factory) { \ skiatest::RunWithGPUTestContexts(test_##name, contexts, reporter, factory); \ } \ skiatest::TestRegistry name##TestRegistry( \ |