diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-05-27 07:23:59 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-05-27 07:23:59 +0000 |
| commit | 5b80c06eb062f6bc2dd7c0479a934141bd796168 (patch) | |
| tree | 2922bbf292569266bd331f3ed4031464f0ca27d4 | |
| parent | f203ed2eeadbe71007546f2a35b919b269a2459e (diff) | |
| parent | e07e0d09fb03ff258f07ae7092a41fc01895b47d (diff) | |
| download | platform_external_skqp-5b80c06eb062f6bc2dd7c0479a934141bd796168.tar.gz platform_external_skqp-5b80c06eb062f6bc2dd7c0479a934141bd796168.tar.bz2 platform_external_skqp-5b80c06eb062f6bc2dd7c0479a934141bd796168.zip | |
Snap for 4807121 from e07e0d09fb03ff258f07ae7092a41fc01895b47d to pi-release
Change-Id: Ia59700f6216daae6069447d046c26e2fd15acfd4
| -rw-r--r-- | platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQPRunner.java | 4 | ||||
| -rw-r--r-- | tools/skqp/gm_knowledge.cpp | 2 |
2 files changed, 3 insertions, 3 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 138d0be0f0..0c6008ccf7 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 @@ -64,12 +64,12 @@ public class SkQPRunner extends Runner implements Filterable { for (int backend = 0; backend < impl.mBackends.length; backend++) { for (int gm = 0; gm < impl.mGMs.length; gm++) { mTests[index++] = Description.createTestDescription(SkQPRunner.class, - impl.mBackends[backend] + "/" + impl.mGMs[gm]); + impl.mBackends[backend] + "_" + impl.mGMs[gm]); } } for (int unitTest = 0; unitTest < impl.mUnitTests.length; unitTest++) { mTests[index++] = Description.createTestDescription(SkQPRunner.class, - "unitTest/" + impl.mUnitTests[unitTest]); + "unitTest_" + impl.mUnitTests[unitTest]); } assert(index == mTests.length); mShouldRunTestCount = mTests.length; diff --git a/tools/skqp/gm_knowledge.cpp b/tools/skqp/gm_knowledge.cpp index df1ded0660..a2416c9dca 100644 --- a/tools/skqp/gm_knowledge.cpp +++ b/tools/skqp/gm_knowledge.cpp @@ -297,7 +297,7 @@ static constexpr char kDocHead[] = "function f(backend, gm, e1, e2) {\n" " var b = ce(\"div\");\n" " var x = ce(\"h2\");\n" - " var t = backend + \"/\" + gm;\n" + " var t = backend + \"_\" + gm;\n" " ac(x, ct(t));\n" " ac(b, x);\n" " ac(b, ct(\"backend: \" + backend));\n" |