SkQP: re-enable workarounds for unit tests. Also, more logging

Change-Id: I74de5477c3cc9a034553363ac525d8f264478153
Reviewed-on: https://skia-review.googlesource.com/99862
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>

2 files changed, 3 insertions, 1 deletions

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 e9c6974ba5..eb95d7fb53 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
@@ -83,6 +83,7 @@ public class SkQPRunner extends Runner {
             String classname = SkQP.kSkiaGM + impl.mBackends[backend];
             for (int gm = 0; gm < impl.mGMs.length; gm++) {
                 String gmName = String.format("%s/%s", impl.mBackends[backend], impl.mGMs[gm]);
+                Log.v(TAG, String.format("Rendering Test %s started", gmName));
                 Description desc =
                         Description.createTestDescription(classname, impl.mGMs[gm], annots);
                 notifier.fireTestStarted(desc);
@@ -108,6 +109,7 @@ public class SkQPRunner extends Runner {
         }
         for (int unitTest = 0; unitTest < impl.mUnitTests.length; unitTest++) {
             String utName = impl.mUnitTests[unitTest];
+            Log.v(TAG, String.format("Test %s started.", utName));
             Description desc = Description.createTestDescription(
                           SkQP.kSkiaUnitTests, utName, annots);
             notifier.fireTestStarted(desc);
diff --git a/tools/skqp/gm_runner.cpp b/tools/skqp/gm_runner.cpp
index 5b45b271f9..437e3c10af 100644
--- a/tools/skqp/gm_runner.cpp
+++ b/tools/skqp/gm_runner.cpp
@@ -85,7 +85,7 @@ std::vector<std::string> ExecuteTest(UnitTest test) {
         }
     } r;
     GrContextOptions options;
-    options.fDisableDriverCorrectnessWorkarounds = true;
+    // options.fDisableDriverCorrectnessWorkarounds = true;
     if (test->fContextOptionsProc) {
         test->fContextOptionsProc(&options);
     }