diff options
| author |  Greg Daniel <egdaniel@google.com> | 2016-11-20 14:53:35 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-20 14:53:48 +0000 |
| commit | 792d0f13d6cb58ddf27b45e6835ba54c1d8ade77 (patch) | |
| tree | 929ba3d4638561e480bb070da4d01eec2cce21ab /tests/SkSLErrorTest.cpp | |
| parent | 7a5b48a75b6f5819c196d158eefa70677783554f (diff) | |
Revert "switched skslc from std::string to SkString"
This reverts commit d8df21a1e08b5b3380261f4b90acfbdc538ef93c.
Reason for revert: Breaking Roll
Original change's description:
> 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 <bsalomon@google.com>
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
>
TBR=bsalomon@google.com,benjaminwagner@google.com,ethannicholas@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I84d5311beb9d5e607b7a4a3c138332f0c8f19648
Reviewed-on: https://skia-review.googlesource.com/5077
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'tests/SkSLErrorTest.cpp')
| -rw-r--r-- | tests/SkSLErrorTest.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/tests/SkSLErrorTest.cpp b/tests/SkSLErrorTest.cpp index c9e342c6d5..e9e05c18d2 100644 --- a/tests/SkSLErrorTest.cpp +++ b/tests/SkSLErrorTest.cpp @@ -9,25 +9,24 @@ #include "Test.h" -#if SK_SUPPORT_GPU +#if SKIA_SUPPORT_GPU static void test_failure(skiatest::Reporter* r, const char* src, const char* error) { SkSL::Compiler compiler; - SkDynamicMemoryWStream out; - bool result = compiler.toSPIRV(SkSL::Program::kFragment_Kind, SkString(src), out); - SkString skError(error); - if (compiler.errorText() != skError) { + std::stringstream out; + bool result = compiler.toSPIRV(SkSL::Program::kFragment_Kind, src, out); + if (compiler.errorText() != error) { 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() == skError); + REPORTER_ASSERT(r, compiler.errorText() == error); } static void test_success(skiatest::Reporter* r, const char* src) { SkSL::Compiler compiler; - SkDynamicMemoryWStream out; - bool result = compiler.toSPIRV(SkSL::Program::kFragment_Kind, SkString(src), out); + std::stringstream out; + bool result = compiler.toSPIRV(SkSL::Program::kFragment_Kind, src, out); REPORTER_ASSERT(r, result); } |