Snap for 4829593 from ac3e5a243a7663822a6e50fb8644fb17907e4839 to pi-release
Change-Id: Iaad51b0f8d82966b77b81cdaaf93669d24341c48
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 0c6008c..297c653 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
@@ -61,15 +61,18 @@
mTests = new Description[this.testCount()];
mShouldSkipTest = new boolean[mTests.length]; // = {false, false, ....};
int index = 0;
+ String badIdentifiers = "[^A-Za-z0-9_]";
for (int backend = 0; backend < impl.mBackends.length; backend++) {
+ String backendName = impl.mBackends[backend];
+ assert(!backendName.matches("^[0-9]"));
for (int gm = 0; gm < impl.mGMs.length; gm++) {
- mTests[index++] = Description.createTestDescription(SkQPRunner.class,
- impl.mBackends[backend] + "_" + impl.mGMs[gm]);
+ String name = (backendName + "_" + impl.mGMs[gm]).replaceAll(badIdentifiers, "_");
+ mTests[index++] = Description.createTestDescription(SkQPRunner.class, name);
}
}
for (int unitTest = 0; unitTest < impl.mUnitTests.length; unitTest++) {
- mTests[index++] = Description.createTestDescription(SkQPRunner.class,
- "unitTest_" + impl.mUnitTests[unitTest]);
+ String name = ("unitTest_" + impl.mUnitTests[unitTest]).replaceAll(badIdentifiers, "_");
+ mTests[index++] = Description.createTestDescription(SkQPRunner.class, name);
}
assert(index == mTests.length);
mShouldRunTestCount = mTests.length;