diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2017-02-09 17:04:23 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-09 17:04:41 +0000 |
| commit | 49a36ba6234168ef3b591f55810c22bf0fe1c2e4 (patch) | |
| tree | 60b2b43588f9b100adc9574bbb3c56e633dc61b7 /tests/SkSLErrorTest.cpp | |
| parent | 90e3cd78991ef337dbd0023efb30ece864694308 (diff) | |
Revert "skslc type constructor cleanups"
This reverts commit 6f223283661c1ddc4a5334d2464804c6b6ba3ffa.
Reason for revert: bot breakage
Original change's description:
> skslc type constructor cleanups
>
> BUG=skia:
>
> Change-Id: I87108b5e107419d99c996ef032eda512a68451ab
> Reviewed-on: https://skia-review.googlesource.com/8117
> Commit-Queue: Greg Daniel <egdaniel@google.com>
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
> Reviewed-by: Greg Daniel <egdaniel@google.com>
>
TBR=egdaniel@google.com,ethannicholas@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Change-Id: I1c9a8c4c62c7dd0f724f22000507112641d25e3b
Reviewed-on: https://skia-review.googlesource.com/8259
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'tests/SkSLErrorTest.cpp')
| -rw-r--r-- | tests/SkSLErrorTest.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/tests/SkSLErrorTest.cpp b/tests/SkSLErrorTest.cpp index 9c34ab41fb..a33e6f16e6 100644 --- a/tests/SkSLErrorTest.cpp +++ b/tests/SkSLErrorTest.cpp @@ -134,10 +134,7 @@ DEF_TEST(SkSLConstructorArgumentCount, r) { "void main() { vec3 x = vec3(1.0, 2.0); }", "error: 1: invalid arguments to 'vec3' constructor (expected 3 scalars, but " "found 2)\n1 error\n"); - test_failure(r, - "void main() { vec3 x = vec3(1.0, 2.0, 3.0, 4.0); }", - "error: 1: invalid arguments to 'vec3' constructor (expected 3 scalars, but found " - "4)\n1 error\n"); + test_success(r, "void main() { vec3 x = vec3(1.0, 2.0, 3.0, 4.0); }"); } DEF_TEST(SkSLSwizzleScalar, r) { |