From 8bad7e01bac9a1e692eca7dafd1adf3eb1761628 Mon Sep 17 00:00:00 2001
From: Hal Canary <halcanary@google.com>
Date: Thu, 18 Jan 2018 08:48:53 -0500
Subject: SkQP: better logging

Change-Id: If0b093cfe646f5805cc4d0660c581150fbf992f4
Reviewed-on: https://skia-review.googlesource.com/96702
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Stephan Altmueller <stephana@google.com>
---
 .../src/main/java/org/skia/skqp/SkQPRunner.java    | 24 +++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

(limited to 'platform_tools')

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 3f48a2bd32..77c824e4a0 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
@@ -58,7 +58,8 @@ public class SkQPRunner extends Runner {
         for (int backend = 0; backend < impl.mBackends.length; backend++) {
             String classname = SkQP.kSkiaGM + impl.mBackends[backend];
             for (int gm = 0; gm < impl.mGMs.length; gm++) {
-                mDescription.addChild(Description.createTestDescription(classname, impl.mGMs[gm], annots));
+                mDescription.addChild(
+                        Description.createTestDescription(classname, impl.mGMs[gm], annots));
             }
         }
         for (int unitTest = 0; unitTest < impl.mUnitTests.length; unitTest++) {
@@ -71,7 +72,9 @@ public class SkQPRunner extends Runner {
     public Description getDescription() { return mDescription; }
 
     @Override
-    public int testCount() { return impl.mUnitTests.length + impl.mGMs.length * impl.mBackends.length; }
+    public int testCount() {
+        return impl.mUnitTests.length + impl.mGMs.length * impl.mBackends.length;
+    }
 
     @Override
     public void run(RunNotifier notifier) {
@@ -79,7 +82,9 @@ public class SkQPRunner extends Runner {
         for (int backend = 0; backend < impl.mBackends.length; backend++) {
             String classname = SkQP.kSkiaGM + impl.mBackends[backend];
             for (int gm = 0; gm < impl.mGMs.length; gm++) {
-                Description desc = Description.createTestDescription(classname, impl.mGMs[gm], annots);
+                String gmName = String.format("%s/%s", impl.mBackends[backend], impl.mGMs[gm]);
+                Description desc =
+                        Description.createTestDescription(classname, impl.mGMs[gm], annots);
                 notifier.fireTestStarted(desc);
                 float value = java.lang.Float.MAX_VALUE;
                 String error = null;
@@ -90,26 +95,35 @@ public class SkQPRunner extends Runner {
                 }
                 if (error != null) {
                     SkQPRunner.Fail(desc, notifier, String.format("Exception: %s", error));
+                    Log.w(TAG, String.format("[ERROR] %s: %s", gmName, error));
                 } else if (value != 0) {
                     SkQPRunner.Fail(desc, notifier, String.format(
                                 "Image mismatch: max channel diff = %f", value));
+                    Log.w(TAG, String.format("[FAIL] %s: %f > 0", gmName, value));
+                } else {
+                    Log.i(TAG, String.format("Rendering Test %s passed", gmName));
                 }
                 notifier.fireTestFinished(desc);
             }
         }
         for (int unitTest = 0; unitTest < impl.mUnitTests.length; unitTest++) {
+            String utName = impl.mUnitTests[unitTest];
             Description desc = Description.createTestDescription(
-                          SkQP.kSkiaUnitTests, impl.mUnitTests[unitTest], annots);
+                          SkQP.kSkiaUnitTests, utName, annots);
             notifier.fireTestStarted(desc);
             String[] errors = impl.nExecuteUnitTest(unitTest);
             if (errors != null && errors.length > 0) {
+                Log.w(TAG, String.format("[FAIL] Test %s had %d failures.", utName, errors.length));
                 for (String error : errors) {
                     SkQPRunner.Fail(desc, notifier, error);
+                    Log.w(TAG, String.format("[FAIL] %s: %s", utName, error));
                 }
+            } else {
+                Log.i(TAG, String.format("Test %s passed.", utName));
             }
             notifier.fireTestFinished(desc);
         }
         impl.nMakeReport();
+        Log.i(TAG, String.format("output written to \"%s\"", GetOutputDir().getAbsolutePath()));
     }
 }
-
-- 
cgit v1.2.3