Merge change 6983

* changes:
  Include the full stacktrace when a test times out.

1 files changed, 5 insertions, 2 deletions

diff --git a/luni/src/test/java/com/google/coretests/CoreTestResult.java b/luni/src/test/java/com/google/coretests/CoreTestResult.java
index 9a821cd..802eff8 100644
--- a/luni/src/test/java/com/google/coretests/CoreTestResult.java
+++ b/luni/src/test/java/com/google/coretests/CoreTestResult.java
@@ -131,6 +131,7 @@ public class CoreTestResult extends TestResult {
                         // Ignored
                     }
                     if (thread.isAlive()) {
+                        StackTraceElement[] trace = thread.getStackTrace();
                         runnable.stop();
                         thread.stop();
                         try {
@@ -138,8 +139,10 @@ public class CoreTestResult extends TestResult {
                         } catch (InterruptedException ex) {
                             // Ignored
                         }
-        
-                        addError(test, new CoreTestTimeout("Test timed out"));
+
+                        CoreTestTimeout timeout = new CoreTestTimeout("Test timed out");
+                        timeout.setStackTrace(trace);
+                        addError(test, timeout);
                     }
                 } else {
                     runnable.run();