Remove SkSLErrorTests from T CTS

These were added after the T release, so they should not be run on T
devices. Ida2c58a30c70d9a4ae0f64ec943662ba1162e406 accidentally added
them in along with other changes that were needed in T.

Bug: b/286962319
Test: atest CtsSkQPTestCases
Change-Id: Ib7fb60b89df411cbfa625ef1d9a4b1c76515bc8c
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/715316
Auto-Submit: Leon Scroggins <scroggo@google.com>
Reviewed-by: John Stiles <johnstiles@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>

platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQPRunner.java

diff --git a/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQPRunner.java b/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQPRunner.java
index c94d932..edd40e5 100644
--- a/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQPRunner.java
+++ b/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQPRunner.java
@@ -108,7 +108,6 @@
     @Override
     public void run(RunNotifier notifier) {
         int testNumber = 0;
-        testNumber = runTests(notifier, new SkSLErrorTestExecutor(), testNumber);
         testNumber = runTests(notifier, new UnitTestExecutor(), testNumber);
 
         mImpl.nMakeReport();

tools/skqp/src/skqp.cpp

diff --git a/tools/skqp/src/skqp.cpp b/tools/skqp/src/skqp.cpp
index f3f109e..b5c73aa 100644
--- a/tools/skqp/src/skqp.cpp
+++ b/tools/skqp/src/skqp.cpp
@@ -63,43 +63,6 @@
         // disable all ES3 tests until AGSL supports it.
         {std::regex(".*ES3.*"), CtsEnforcement::kNever}};
 
-// Returns a list of every SkSL error test to be run.
-static std::vector<SkQP::SkSLErrorTest> get_sksl_error_tests(SkQPAssetManager* assetManager,
-                                                             int enforcedAndroidAPILevel) {
-    std::vector<SkQP::SkSLErrorTest> skslErrorTests;
-    auto iterateFn = [&](const char* directory, const char* extension) {
-        std::vector<std::string> paths = assetManager->iterateDir(directory, extension);
-        for (const std::string& path : paths) {
-            SkString name = SkOSPath::Basename(path.c_str());
-            for (auto& exclusionEntry : sExclusionRulesForSkSLTests) {
-                if (std::regex_match(name.c_str(), exclusionEntry.first) &&
-                    exclusionEntry.second.eval(enforcedAndroidAPILevel) ==
-                            CtsEnforcement::RunMode::kSkip) {
-                    continue;
-                }
-            }
-            sk_sp<SkData> shaderText = GetResourceAsData(path.c_str());
-            if (!shaderText) {
-                continue;
-            }
-            skslErrorTests.push_back({
-                name.c_str(),
-                std::string(static_cast<const char*>(shaderText->data()), shaderText->size())
-            });
-        }
-    };
-
-    // Android only supports runtime shaders, not fragment shaders, color filters or blenders.
-    iterateFn("sksl/errors/", ".rts");
-    iterateFn("sksl/runtime_errors/", ".rts");
-
-    auto lt = [](const SkQP::SkSLErrorTest& a, const SkQP::SkSLErrorTest& b) {
-        return a.name < b.name;
-    };
-    std::sort(skslErrorTests.begin(), skslErrorTests.end(), lt);
-    return skslErrorTests;
-}
-
 static std::unique_ptr<sk_gpu_test::TestContext> make_test_context(SkQP::SkiaBackend backend) {
     using U = std::unique_ptr<sk_gpu_test::TestContext>;
     switch (backend) {
@@ -211,7 +174,6 @@
 #endif
 
     fUnitTests = get_unit_tests(fEnforcedAndroidAPILevel);
-    fSkSLErrorTests = get_sksl_error_tests(assetManager, fEnforcedAndroidAPILevel);
     fSupportedBackends = get_backends();
 
     print_backend_info((fReportDirectory + "/grdump.txt").c_str(), fSupportedBackends);