commit f6f099e283e693a34a6bb6af1963c17c4ec343f7
author Rico Wind <ricow@google.com> Mon Aug 14 04:56:28 2023 +0000
committer Rico Wind <ricow@google.com> Mon Aug 14 06:29:16 2023 +0000
tree d3a01ffc945f058f97a4e029ccb8e17d246a7477
parent 4818724dc6821648d5b52d8db3453fe2a7471dc4

Revert "Split on tab for retrace lines after update to proguard retrace"

This reverts commit 7c7c3741f3b0ea3254bbf7857643a56bdcb3d61b.

Reason for revert: This is causing test failures on the bots

Change-Id: Ieeae3b3bdc6ad71d1759a07a49d4bac1cdb0faa5

src/test/java/com/android/tools/r8/naming/retraceproguard/StackTrace.java

diff --git a/src/test/java/com/android/tools/r8/naming/retraceproguard/StackTrace.java b/src/test/java/com/android/tools/r8/naming/retraceproguard/StackTrace.java
index 65a0803..7e65d56 100644
--- a/src/test/java/com/android/tools/r8/naming/retraceproguard/StackTrace.java
+++ b/src/test/java/com/android/tools/r8/naming/retraceproguard/StackTrace.java
@@ -19,7 +19,6 @@
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
@@ -193,8 +192,6 @@
   private static List<StackTraceLine> internalExtractFromJvm(String stderr) {
     return StringUtils.splitLines(stderr).stream()
         .filter(s -> s.startsWith(TAB_AT_PREFIX))
-        .flatMap(s -> Arrays.stream(s.split("\t")))
-        .filter(s -> s.startsWith(AT_PREFIX))
         .map(StackTraceLine::parse)
         .collect(Collectors.toList());
   }
@@ -223,7 +220,8 @@
   }
 
   public StackTrace retrace(String map, Path tempFolder) throws IOException {
-    return retrace(ProguardVersion.getLatest(), map, tempFolder);
+    // TODO(b/295305981): Fails with 7.3.2 for some tests.
+    return retrace(ProguardVersion.V7_0_0, map, tempFolder);
   }
 
   public StackTrace retrace(ProguardVersion proguardVersion, String map, Path tempFolder)