AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Hal Canary 2018-10-26 13:42:28 -04:00 committed by Skia Commit-Bot
parent 0675ffaef6
commit 2474c3b5b9
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQPFailure.java Normal file
View File

@ -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); }
}

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

@ -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";