diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-07-06 10:09:38 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-06 14:35:45 +0000 |
| commit | 0c26a9dbd0b6546731df63c01411cb2aaa5ba236 (patch) | |
| tree | 02779da50097086c27bc5f0a1885e419ad4162a5 /tests | |
| parent | 7c26ca770b08bd75dd8f347350a0f958953d3071 (diff) | |
GR_TEST_UTILS fixes
Fixes build of Skia lib when GR_TEST_UTILS=0
Makes GR_TEST_UTILS=0 for official builds
Makes "Mini" builder bot exercise building GPU with is_official_build=true
Bug: skia:6786
Change-Id: I6186683a3a216d2e779645bd9e8276a66bcff4d5
Reviewed-on: https://skia-review.googlesource.com/21524
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/GLProgramsTest.cpp | 2 | ||||
| -rw-r--r-- | tests/SkSLFPTest.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp index 4a89d0a9bf..c6616b1b79 100644 --- a/tests/GLProgramsTest.cpp +++ b/tests/GLProgramsTest.cpp @@ -83,7 +83,7 @@ private: } bool onIsEqual(const GrFragmentProcessor&) const override { return true; } - GR_DECLARE_FRAGMENT_PROCESSOR_TEST; + GR_DECLARE_FRAGMENT_PROCESSOR_TEST typedef GrFragmentProcessor INHERITED; }; diff --git a/tests/SkSLFPTest.cpp b/tests/SkSLFPTest.cpp index 8862c56874..64b4e71d8e 100644 --- a/tests/SkSLFPTest.cpp +++ b/tests/SkSLFPTest.cpp @@ -96,7 +96,7 @@ DEF_TEST(SkSLFPHelloWorld, r) { " void onGetGLSLProcessorKey(const GrShaderCaps&,GrProcessorKeyBuilder*) " "const override;\n" " bool onIsEqual(const GrFragmentProcessor&) const override;\n" - " GR_DECLARE_FRAGMENT_PROCESSOR_TEST;\n" + " GR_DECLARE_FRAGMENT_PROCESSOR_TEST\n" " typedef GrFragmentProcessor INHERITED;\n" "};\n" "#endif\n" @@ -287,7 +287,7 @@ DEF_TEST(SkSLFPSections, r) { "}", *SkSL::ShaderCapsFactory::Default(), { - "GR_DECLARE_FRAGMENT_PROCESSOR_TEST;\n" + "GR_DECLARE_FRAGMENT_PROCESSOR_TEST\n" " fields section typedef GrFragmentProcessor INHERITED;" }, {}); |