commit 0c26a9dbd0b6546731df63c01411cb2aaa5ba236
author Brian Salomon <bsalomon@google.com> Thu Jul 06 10:09:38 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jul 06 14:35:45 2017 +0000
tree 02779da50097086c27bc5f0a1885e419ad4162a5
parent 7c26ca770b08bd75dd8f347350a0f958953d3071

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>

tests/SkSLFPTest.cpp

diff --git a/tests/SkSLFPTest.cpp b/tests/SkSLFPTest.cpp
index 8862c56..64b4e71 100644
--- a/tests/SkSLFPTest.cpp
+++ b/tests/SkSLFPTest.cpp
@@ -96,7 +96,7 @@
              "    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 @@
          "}",
          *SkSL::ShaderCapsFactory::Default(),
          {
-            "GR_DECLARE_FRAGMENT_PROCESSOR_TEST;\n"
+            "GR_DECLARE_FRAGMENT_PROCESSOR_TEST\n"
             " fields section     typedef GrFragmentProcessor INHERITED;"
          },
          {});