From d8df21a1e08b5b3380261f4b90acfbdc538ef93c Mon Sep 17 00:00:00 2001 From: Ethan Nicholas Date: Thu, 17 Nov 2016 16:13:37 -0500 Subject: switched skslc from std::string to SkString BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4977 Change-Id: I15e24963b09b719a2c07da67745114f5ac66cee8 Reviewed-on: https://skia-review.googlesource.com/4977 Reviewed-by: Brian Salomon Commit-Queue: Ethan Nicholas --- tests/SkSLErrorTest.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'tests/SkSLErrorTest.cpp') diff --git a/tests/SkSLErrorTest.cpp b/tests/SkSLErrorTest.cpp index e9e05c18d2..c9e342c6d5 100644 --- a/tests/SkSLErrorTest.cpp +++ b/tests/SkSLErrorTest.cpp @@ -9,24 +9,25 @@ #include "Test.h" -#if SKIA_SUPPORT_GPU +#if SK_SUPPORT_GPU static void test_failure(skiatest::Reporter* r, const char* src, const char* error) { SkSL::Compiler compiler; - std::stringstream out; - bool result = compiler.toSPIRV(SkSL::Program::kFragment_Kind, src, out); - if (compiler.errorText() != error) { + SkDynamicMemoryWStream out; + bool result = compiler.toSPIRV(SkSL::Program::kFragment_Kind, SkString(src), out); + SkString skError(error); + if (compiler.errorText() != skError) { SkDebugf("SKSL ERROR:\n source: %s\n expected: %s received: %s", src, error, compiler.errorText().c_str()); } REPORTER_ASSERT(r, !result); - REPORTER_ASSERT(r, compiler.errorText() == error); + REPORTER_ASSERT(r, compiler.errorText() == skError); } static void test_success(skiatest::Reporter* r, const char* src) { SkSL::Compiler compiler; - std::stringstream out; - bool result = compiler.toSPIRV(SkSL::Program::kFragment_Kind, src, out); + SkDynamicMemoryWStream out; + bool result = compiler.toSPIRV(SkSL::Program::kFragment_Kind, SkString(src), out); REPORTER_ASSERT(r, result); } -- cgit v1.2.3