diff options
author | Hal Canary <halcanary@google.com> | 2018-06-07 15:42:27 -0400 |
---|---|---|
committer | Leon Scroggins III <scroggo@google.com> | 2018-06-07 16:10:53 -0400 |
commit | ac3e5a243a7663822a6e50fb8644fb17907e4839 (patch) | |
tree | b6dd465a9b9d5c45eec922f3444984c33659e362 | |
parent | e07e0d09fb03ff258f07ae7092a41fc01895b47d (diff) | |
download | skqp-pie-qpr3-b-release.tar.gz |
SkQP: junit uses java identifiersandroid-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-dev
Bug: 109842281
Test: This
Fix up test names to only include valid characters.
Change-Id: I4709d7a92e6ad822ec1f208823ddb3b37356d142
-rw-r--r-- | platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQPRunner.java | 11 |
1 files changed, 7 insertions, 4 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 0c6008ccf7..297c6539a7 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 @@ public class SkQPRunner extends Runner implements Filterable { 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; |