Bump the retrace timeout and log timestamps
Change-Id: I6e0d4453a4ed85d31a3490b2bd4f2f45e40e71dd
diff --git a/d8_r8/commonBuildSrc/src/main/kotlin/TestConfigurationHelper.kt b/d8_r8/commonBuildSrc/src/main/kotlin/TestConfigurationHelper.kt
index 36276ff..c0a9833 100644
--- a/d8_r8/commonBuildSrc/src/main/kotlin/TestConfigurationHelper.kt
+++ b/d8_r8/commonBuildSrc/src/main/kotlin/TestConfigurationHelper.kt
@@ -18,7 +18,7 @@
fun retrace(project: Project, r8jar: File, mappingFile: File, exception: Throwable): String {
val out = StringBuilder()
- val header = "RETRACED STACKTRACE";
+ val header = "RETRACED STACKTRACE: " + System.currentTimeMillis()
out.append("\n--------------------------------------\n")
out.append("${header}\n")
out.append("--------------------------------------\n")
@@ -32,12 +32,12 @@
val process = ProcessBuilder(command).start()
process.outputStream.use { exception.printStackTrace(PrintStream(it)) }
process.outputStream.close()
- val processCompleted = process.waitFor(10L, TimeUnit.SECONDS)
+ val processCompleted = process.waitFor(20L, TimeUnit.SECONDS)
&& process.exitValue() == 0
out.append(process.inputStream.bufferedReader().use { it.readText() })
if (!processCompleted) {
out.append(command.joinToString(" ") + "\n")
- out.append("ERROR DURING RETRACING\n")
+ out.append("ERROR DURING RETRACING: " + System.currentTimeMillis() + "\n")
out.append(process.errorStream.bufferedReader().use { it.readText() })
}
if (project.hasProperty("print_obfuscated_stacktraces") || !processCompleted) {
