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 <stephana@google.com>
Commit-Queue: Derek Sollenberger <djsollen@google.com>
(cherry picked from commit 749f6213768f828d98266d81e7be3198cbe6dca5)
Reviewed-on: https://skia-review.googlesource.com/129620
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 138d0be..0c6008c 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 @@
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 df1ded0..a2416c9 100644
--- a/tools/skqp/gm_knowledge.cpp
+++ b/tools/skqp/gm_knowledge.cpp
@@ -297,7 +297,7 @@
"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"
