diff options
author | Derek Sollenberger <djsollen@google.com> | 2018-05-22 14:19:39 -0400 |
---|---|---|
committer | Derek Sollenberger <djsollen@google.com> | 2018-05-23 14:13:57 -0400 |
commit | e07e0d09fb03ff258f07ae7092a41fc01895b47d (patch) | |
tree | 2922bbf292569266bd331f3ed4031464f0ca27d4 | |
parent | f084c17322833068a79c4cc340157dd79fd1daca (diff) | |
download | platform_external_skqp-e07e0d09fb03ff258f07ae7092a41fc01895b47d.tar.gz platform_external_skqp-e07e0d09fb03ff258f07ae7092a41fc01895b47d.tar.bz2 platform_external_skqp-e07e0d09fb03ff258f07ae7092a41fc01895b47d.zip |
Remove "/" from the generated jUnit method names.
The "/" character is not a valid character for method names in the
CTS testing environment and is causing problems with some of the
tooling so we are replacing the "/" with "_".
cherry picked from commit e4201104f1659e5ca283f0126f42403609e379d7
Reviewed-on: https://skia-review.googlesource.com/129620
Bug: 80096930
Test: atest CtsSkQPTestCases
Change-Id: Ia260eed13d590ecc90debfb7050a0ff295a76885
-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" |