commit d2c5a802812315c933c34aee3c036f0736fcd69c
author John Stiles <johnstiles@google.com> Wed May 19 21:42:57 2021 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu May 20 18:45:35 2021 +0000
tree 23daa53b2ba0a02d3cc8709e5ae56d4dd0610cc1
parent 6017b4833fa01769a534010573d5b8fe7504f3dc

Enable additional do-while SkSL tests.

These tests were written earlier but not enabled due to the absence of
ES3 support in Runtime Effects.

Change-Id: Idaf81926271e5b2e483a7c5cfce824a0056f5595
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/410460
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>

tests/SkSLTest.cpp

diff --git a/tests/SkSLTest.cpp b/tests/SkSLTest.cpp
index d64ea14..8023cac 100644
--- a/tests/SkSLTest.cpp
+++ b/tests/SkSLTest.cpp
@@ -164,6 +164,9 @@
 SKSL_TEST(SkSLVectorScalarFolding,             "folding/VectorScalarFolding.sksl")
 SKSL_TEST(SkSLVectorVectorFolding,             "folding/VectorVectorFolding.sksl")
 
+SKSL_TEST_ES3(SkSLDoWhileBodyMustBeInlinedIntoAScope,
+         "inliner/DoWhileBodyMustBeInlinedIntoAScope.sksl")
+SKSL_TEST_ES3(SkSLDoWhileTestCannotBeInlined,     "inliner/DoWhileTestCannotBeInlined.sksl")
 SKSL_TEST(SkSLForBodyMustBeInlinedIntoAScope,     "inliner/ForBodyMustBeInlinedIntoAScope.sksl")
 SKSL_TEST_ES3(SkSLForInitializerExpressionsCanBeInlined,
          "inliner/ForInitializerExpressionsCanBeInlined.sksl")
@@ -231,6 +234,7 @@
 SKSL_TEST(SkSLDeadReturn,                      "shared/DeadReturn.sksl")
 SKSL_TEST(SkSLDeadStripFunctions,              "shared/DeadStripFunctions.sksl")
 SKSL_TEST(SkSLDependentInitializers,           "shared/DependentInitializers.sksl")
+SKSL_TEST_ES3(SkSLDoWhileControlFlow,          "shared/DoWhileControlFlow.sksl")
 SKSL_TEST(SkSLEmptyBlocksES2,                  "shared/EmptyBlocksES2.sksl")
 SKSL_TEST(SkSLForLoopControlFlow,              "shared/ForLoopControlFlow.sksl")
 SKSL_TEST(SkSLFunctionArgTypeMatch,            "shared/FunctionArgTypeMatch.sksl")
@@ -289,8 +293,6 @@
 
 SKSL_TEST(SkSLMatrixFoldingES3,                "folding/MatrixFoldingES3.sksl")
 
-SKSL_TEST(SkSLDoWhileBodyMustBeInlinedIntoAScope, "inliner/DoWhileBodyMustBeInlinedIntoAScope.sksl")
-SKSL_TEST(SkSLDoWhileTestCannotBeInlined,         "inliner/DoWhileTestCannotBeInlined.sksl")
 SKSL_TEST(SkSLEnumsCanBeInlinedSafely,         "inliner/EnumsCanBeInlinedSafely.sksl")
 
 SKSL_TEST(SkSLIntrinsicAbsInt,                 "intrinsics/AbsInt.sksl")
@@ -301,7 +303,6 @@
 SKSL_TEST(SkSLIntrinsicSignInt,                "intrinsics/SignInt.sksl")
 
 SKSL_TEST(SkSLDeadLoopVariable,                "shared/DeadLoopVariable.sksl")
-SKSL_TEST(SkSLDoWhileControlFlow,              "shared/DoWhileControlFlow.sksl")
 SKSL_TEST(SkSLEmptyBlocksES3,                  "shared/EmptyBlocksES3.sksl")
 SKSL_TEST(SkSLHexUnsigned,                     "shared/HexUnsigned.sksl")
 SKSL_TEST(SkSLResizeMatrixNonsquare,           "shared/ResizeMatrixNonsquare.sksl")