Test app robustness

btraceio · Oct 8, 2022 · 58e6b3d · 58e6b3d
1 parent 1a80c19
commit 58e6b3d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 13 deletions.
diff --git a/btrace-instr/src/test/java/org/openjdk/btrace/RuntimeTest.java b/btrace-instr/src/test/java/org/openjdk/btrace/RuntimeTest.java
@@ -263,10 +263,14 @@ public void test(
       Process client = attach(pid, testScript, cmdArgs, checkLines, stdout, stderr);
 
       System.out.println("Detached.");
-      pw.println("done");
-      pw.flush();
+      boolean exitted = false;
+      while (!exitted) {
+        pw.println("done");
+        pw.flush();
+        exitted = client.waitFor(1, TimeUnit.SECONDS);
+      }
 
-      ret.set(client.waitFor());
+      ret.set(client.exitValue());
 
       outT.join();
       errT.join();

diff --git a/btrace-instr/src/test/java/resources/TestApp.java b/btrace-instr/src/test/java/resources/TestApp.java
@@ -45,16 +45,19 @@ public void run() {
         t.setDaemon(true);
         t.start();
 
-        String resp = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8)).readLine();
-        System.out.println("Received " + resp + " - " + "done".equals(resp));
-        if ("done".equals(resp)) {
-            System.out.flush();
-            System.out.println(System.currentTimeMillis() + ":  Interrupting the worker thread");
-            t.interrupt();
-            System.out.println(System.currentTimeMillis() + ": Waiting for the worker thread to finish");
-            t.join();
-            System.out.println(System.currentTimeMillis() + ": Worker thread finished");
-        }
+        do {
+            String resp = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8)).readLine();
+            System.out.println("Received " + resp + " - " + "done".contains(resp));
+            if ("done".contains(resp)) {
+                System.out.flush();
+                System.out.println(System.currentTimeMillis() + ":  Interrupting the worker thread");
+                t.interrupt();
+                System.out.println(System.currentTimeMillis() + ": Waiting for the worker thread to finish");
+                t.join();
+                System.out.println(System.currentTimeMillis() + ": Worker thread finished");
+                break;
+            }
+        } while (true);
     }
 
     private static long getPID() {