[Retrace] Remove core names test
This is looking up manually in the map and is not using retrace
Change-Id: Id91201f75967fd72221620815a9772cbe3476376
diff --git a/src/main/java/com/android/tools/r8/retrace/RetraceRegularExpression.java b/src/main/java/com/android/tools/r8/retrace/RetraceRegularExpression.java
index b561305..4973190 100644
--- a/src/main/java/com/android/tools/r8/retrace/RetraceRegularExpression.java
+++ b/src/main/java/com/android/tools/r8/retrace/RetraceRegularExpression.java
@@ -390,7 +390,8 @@
}
// TODO(b/145731185): Extend support for identifiers with strings inside back ticks.
- private static final String javaIdentifierSegment = "[\\p{L}\\p{N}_\\p{Sc}]+";
+ private static final String javaIdentifierSegment =
+ "\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*";
private abstract static class ClassNameGroup extends RegularExpressionGroup {
diff --git a/src/test/java/com/android/tools/r8/internal/retrace/RetraceTests.java b/src/test/java/com/android/tools/r8/internal/retrace/RetraceTests.java
index d1dbb1d..6fea76f 100644
--- a/src/test/java/com/android/tools/r8/internal/retrace/RetraceTests.java
+++ b/src/test/java/com/android/tools/r8/internal/retrace/RetraceTests.java
@@ -10,7 +10,6 @@
import com.android.tools.r8.TestDiagnosticMessagesImpl;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.TestParametersCollection;
-import com.android.tools.r8.internal.retrace.stacktraces.CoreStackTrace;
import com.android.tools.r8.internal.retrace.stacktraces.CronetStackTrace;
import com.android.tools.r8.internal.retrace.stacktraces.FinskyStackTrace;
import com.android.tools.r8.internal.retrace.stacktraces.VelvetStackTrace;
@@ -20,7 +19,6 @@
import java.util.List;
import java.util.function.BiConsumer;
import junit.framework.TestCase;
-import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -51,12 +49,6 @@
runRetraceTest(new VelvetStackTrace());
}
- @Test
- public void testCoreStackTrace() {
- // TODO(b/159420576): Figure out why we cannot retrace this.
- runRetraceTest(new CoreStackTrace(), DEFAULT_REGULAR_EXPRESSION, Assert::assertNotEquals);
- }
-
private TestDiagnosticMessagesImpl runRetraceTest(StackTraceForTest stackTraceForTest) {
return runRetraceTest(stackTraceForTest, DEFAULT_REGULAR_EXPRESSION);
}
diff --git a/src/test/java/com/android/tools/r8/internal/retrace/stacktraces/CoreStackTrace.java b/src/test/java/com/android/tools/r8/internal/retrace/stacktraces/CoreStackTrace.java
deleted file mode 100644
index 480c00d..0000000
--- a/src/test/java/com/android/tools/r8/internal/retrace/stacktraces/CoreStackTrace.java
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) 2020, the R8 project authors. Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-package com.android.tools.r8.internal.retrace.stacktraces;
-
-public class CoreStackTrace extends RetraceInternalStackTraceForTest {
-
- public CoreStackTrace() {
- super("core_obfuscated.txt", "core_deobfuscated.txt");
- }
-}
