From 749f6213768f828d98266d81e7be3198cbe6dca5 Mon Sep 17 00:00:00 2001 From: Derek Sollenberger Date: Tue, 22 May 2018 14:19:39 -0400 Subject: [PATCH] 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 "_". Bug: b/80096930 Change-Id: Icdf790b0975f7c4205153887ffabaaaa85f07592 Reviewed-on: https://skia-review.googlesource.com/129581 Reviewed-by: Stephan Altmueller Commit-Queue: Derek Sollenberger --- .../apps/skqp/src/main/java/org/skia/skqp/SkQPRunner.java | 4 ++-- 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"