Revert "Update test to not trace thread start / join"

This reverts commit 04c7c63a3694074640eaad54c61a4c4bcb02cb6b.

Reason for revert: Causes breakages on luci:
https://ci.chromium.org/ui/p/art/builders/ci/host-x86_64-cms/8691/overview

Change-Id: I77b8dd52fc2402170df9a000b30311580cf918dc

1 files changed, 4 insertions, 20 deletions

diff --git a/test/2246-trace-stream/src/Main.java b/test/2246-trace-stream/src/Main.java
index e76f1bde7e..daada7d1b1 100644
--- a/test/2246-trace-stream/src/Main.java
+++ b/test/2246-trace-stream/src/Main.java
@@ -47,38 +47,22 @@ public class Main {
         FileOutputStream out_file = new FileOutputStream(file);
         Main m = new Main();
         Thread t = new Thread(() -> {
-            try {
-                VMDebug.startMethodTracing(
-                        file.getPath(), out_file.getFD(), 0, 0, false, 0, streaming);
-                Main m1 = new Main();
-                m1.$noinline$doSomeWork();
-                VMDebug.$noinline$stopMethodTracing();
-                out_file.close();
-                parser.CheckTraceFileFormat(file, expected_version);
-                file.delete();
-            } catch (Exception e) {
-                System.out.println("Exception in thread " + e);
-                e.printStackTrace();
-            }
+            Main m1 = new Main();
+            m1.$noinline$doSomeWork();
         }, "TestThread2246");
         try {
             if (VMDebug.getMethodTracingMode() != 0) {
                 VMDebug.$noinline$stopMethodTracing();
             }
 
+            VMDebug.startMethodTracing(file.getPath(), out_file.getFD(), 0, 0, false, 0, streaming);
             t.start();
             t.join();
-
-            file = createTempFile();
-            FileOutputStream main_out_file = new FileOutputStream(file);
-            VMDebug.startMethodTracing(
-                    file.getPath(), main_out_file.getFD(), 0, 0, false, 0, streaming);
             m.$noinline$doSomeWork();
             m.doSomeWorkThrow();
             VMDebug.$noinline$stopMethodTracing();
-            main_out_file.close();
+            out_file.close();
             parser.CheckTraceFileFormat(file, expected_version);
-            file.delete();
         } finally {
             if (out_file != null) {
                 out_file.close();