SkQP/Java: remove unneeded stack trace, count tests correcctly

Change-Id: I347817c785d28340001e130a691d034cccec4ec1
Reviewed-on: https://skia-review.googlesource.com/c/165310
Commit-Queue: Hal Canary <halcanary@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
Auto-Submit: Hal Canary <halcanary@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>

2 files changed, 11 insertions, 3 deletions

diff --git a/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQPFailure.java b/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQPFailure.java
new file mode 100644
index 0000000000..174890e215
--- /dev/null
+++ b/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQPFailure.java
@@ -0,0 +1,8 @@
+// Copyright 2018 Google LLC.
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+package org.skia.skqp;
+
+public class SkQPFailure extends java.lang.Throwable {
+    public SkQPFailure(String m) { super(m, null, true, false); }
+}
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 f7e18eed05..11a8e2bd6c 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
@@ -32,7 +32,7 @@ public class SkQPRunner extends Runner implements Filterable {
     private static final String TAG = SkQP.LOG_PREFIX;
 
     private static void Fail(Description desc, RunNotifier notifier, String failure) {
-        notifier.fireTestFailure(new Failure(desc, new Throwable(failure)));
+        notifier.fireTestFailure(new Failure(desc, new SkQPFailure(failure)));
     }
 
     private static File GetOutputDir() {
@@ -110,12 +110,12 @@ public class SkQPRunner extends Runner implements Filterable {
         int testIndex = 0;  // out of potential tests.
         for (int backend = 0; backend < impl.mBackends.length; backend++) {
             for (int gm = 0; gm < impl.mGMs.length; gm++, testIndex++) {
-                ++testNumber;
                 Description desc = mTests[testIndex];
                 String name = desc.getMethodName();
                 if (mShouldSkipTest[testIndex]) {
                     continue;
                 }
+                ++testNumber;
                 notifier.fireTestStarted(desc);
                 float value = java.lang.Float.MAX_VALUE;
                 String error = null;
@@ -141,12 +141,12 @@ public class SkQPRunner extends Runner implements Filterable {
             }
         }
         for (int unitTest = 0; unitTest < impl.mUnitTests.length; unitTest++, testIndex++) {
-            ++testNumber;
             Description desc = mTests[testIndex];
             String name = desc.getMethodName();
             if (mShouldSkipTest[testIndex]) {
                 continue;
             }
+            ++testNumber;
             notifier.fireTestStarted(desc);
             String[] errors = impl.nExecuteUnitTest(unitTest);
             String result = "pass";