diff options
| author |  Hal Canary <halcanary@google.com> | 2018-01-19 13:08:23 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-01-22 20:11:57 +0000 |
| commit | a9de760a217cf48c974d6c51b4ba88f08c269bbe (patch) | |
| tree | 16924fe7092b51a982ad667524440c5b6bbbe0e7 /platform_tools | |
| parent | 3b428cbf8a2f4b8d4fad7f2708e67cf954ba7bf1 (diff) | |
SkQP: replace blacklist with: DoNotExecuteInExperimentalMode and NoScoreInCompatibilityTestMode
Also clean up some things, fix docs, whitelist.
Change-Id: I2818d973978ffe1b8ce0cc9c69f8d91ab4a0ef22
Reviewed-on: https://skia-review.googlesource.com/91805
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'platform_tools')
7 files changed, 3 insertions, 4 deletions
diff --git a/platform_tools/android/.gitignore b/platform_tools/android/.gitignore index 26e14aa29f..cb3f2d6237 100644 --- a/platform_tools/android/.gitignore +++ b/platform_tools/android/.gitignore @@ -9,4 +9,3 @@ app/.project app/bin app/gen app/lint.xml -/apps/skqp/src/main/assets diff --git a/platform_tools/android/apps/skqp/src/main/assets/skqp/DoNotExecuteInExperimentalMode.txt b/platform_tools/android/apps/skqp/src/main/assets/skqp/DoNotExecuteInExperimentalMode.txt new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/platform_tools/android/apps/skqp/src/main/assets/skqp/DoNotExecuteInExperimentalMode.txt diff --git a/platform_tools/android/apps/skqp/src/main/assets/skqp/DoNotScoreInCompatibilityTestMode.txt b/platform_tools/android/apps/skqp/src/main/assets/skqp/DoNotScoreInCompatibilityTestMode.txt new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/platform_tools/android/apps/skqp/src/main/assets/skqp/DoNotScoreInCompatibilityTestMode.txt diff --git a/platform_tools/android/apps/skqp/src/main/assets/skqp/KnownGMs.txt b/platform_tools/android/apps/skqp/src/main/assets/skqp/KnownGMs.txt new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/platform_tools/android/apps/skqp/src/main/assets/skqp/KnownGMs.txt diff --git a/platform_tools/android/apps/skqp/src/main/assets/skqp/KnownGpuUnitTests.txt b/platform_tools/android/apps/skqp/src/main/assets/skqp/KnownGpuUnitTests.txt new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/platform_tools/android/apps/skqp/src/main/assets/skqp/KnownGpuUnitTests.txt diff --git a/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQP.java b/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQP.java index 1ebfa223da..039abb54b8 100644 --- a/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQP.java +++ b/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQP.java @@ -14,7 +14,7 @@ import java.io.File; import java.io.IOException; public class SkQP { - protected native void nInit(AssetManager assetManager, String dataDir); + protected native void nInit(AssetManager assetManager, String dataDir, boolean experimentalMode); protected native float nExecuteGM(int gm, int backend) throws SkQPException; protected native String[] nExecuteUnitTest(int test); protected native void nMakeReport(); @@ -42,7 +42,7 @@ public class SkQP { // Note: nInit will initialize the mGMs, mBackends and mUnitTests fields. AssetManager assetManager = context.getResources().getAssets(); - this.nInit(assetManager, outputDirPath); + this.nInit(assetManager, outputDirPath, true); for (int backend = 0; backend < mBackends.length; backend++) { String classname = kSkiaGM + mBackends[backend]; 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 77c824e4a0..e9c6974ba5 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 @@ -51,7 +51,7 @@ public class SkQPRunner extends Runner { Resources resources = InstrumentationRegistry.getTargetContext().getResources(); AssetManager mAssetManager = resources.getAssets(); - impl.nInit(mAssetManager, filesDir.getAbsolutePath()); + impl.nInit(mAssetManager, filesDir.getAbsolutePath(), false); mDescription = Description.createSuiteDescription(testClass); Annotation annots[] = new Annotation[0]; |