8266646: Add more diagnostic to java/lang/System/LoggerFinder/modules

Reviewed-by: naoto, iris, bpb, lancea
openjdk · May 7, 2021 · 3fcdc50 · 3fcdc50 · openjdk-notifier · May 7, 2021
1 parent 9a19a0c
commit 3fcdc50
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 11 deletions.
diff --git a/test/jdk/java/lang/System/LoggerFinder/modules/boot_client/BootClient.java b/test/jdk/java/lang/System/LoggerFinder/modules/boot_client/BootClient.java
@@ -23,6 +23,7 @@
 
 import java.lang.reflect.Method;
 import java.lang.System.Logger;
+import java.time.Instant;
 import java.util.ResourceBundle;
 import java.util.ListResourceBundle;
 
@@ -36,9 +37,13 @@ public static void main(String[] args) throws Exception {
         String loggerMode = args[0];
         String loggerClassName = args[1];
         String underlyingLoggerClassName = args.length >= 3 ? args[2] : null;
-
-        testLogger(loggerMode, loggerClassName, underlyingLoggerClassName);
-        testLog(underlyingLoggerClassName);
+        System.err.println("BootClient starting at " + Instant.now());
+        try {
+            testLogger(loggerMode, loggerClassName, underlyingLoggerClassName);
+            testLog(underlyingLoggerClassName);
+        } finally {
+            System.err.println("BootClient finished at " + Instant.now());
+        }
     }
 
     /*

diff --git a/test/jdk/java/lang/System/LoggerFinder/modules/named_client/m.t.a/pkg/a/t/TestA.java b/test/jdk/java/lang/System/LoggerFinder/modules/named_client/m.t.a/pkg/a/t/TestA.java
@@ -25,6 +25,7 @@
 
 import java.lang.reflect.Method;
 import java.lang.System.Logger;
+import java.time.Instant;
 import java.util.ResourceBundle;
 import java.util.ListResourceBundle;
 
@@ -37,9 +38,13 @@ public static void main(String[] args) throws Exception {
         assertTrue(args.length == 2);
         String loggerMode = args[0];
         String loggerClassName = args[1];
-
-        testLogger(loggerMode, loggerClassName);
-        testLog(loggerClassName);
+        System.err.println("TestA starting at " + Instant.now());
+        try {
+            testLogger(loggerMode, loggerClassName);
+            testLog(loggerClassName);
+        } finally {
+            System.err.println("TestA finished at " + Instant.now());
+        }
     }
 
     /*

diff --git a/test/jdk/java/lang/System/LoggerFinder/modules/patched_client/PatchedClient.java b/test/jdk/java/lang/System/LoggerFinder/modules/patched_client/PatchedClient.java
@@ -23,6 +23,7 @@
 
 import java.lang.reflect.Method;
 import java.lang.System.Logger;
+import java.time.Instant;
 import java.util.ResourceBundle;
 import java.util.ListResourceBundle;
 
@@ -36,9 +37,14 @@ public static void main(String[] args) throws Exception {
         String loggerMode = args[0];
         String loggerClassName = args[1];
         String underlyingLoggerClassName = args.length >= 3 ? args[2] : null;
+        System.err.println("PatchedClient starting at " + Instant.now());
+        try {
+            testLogger(loggerMode, loggerClassName, underlyingLoggerClassName);
+            testLog(underlyingLoggerClassName);
+        } finally {
+            System.err.println("PatchedClient finished at " + Instant.now());
+        }
 
-        testLogger(loggerMode, loggerClassName, underlyingLoggerClassName);
-        testLog(underlyingLoggerClassName);
     }
 
     /*

diff --git a/test/jdk/java/lang/System/LoggerFinder/modules/unnamed_client/pkg/b/t/TestB.java b/test/jdk/java/lang/System/LoggerFinder/modules/unnamed_client/pkg/b/t/TestB.java
@@ -25,6 +25,7 @@
 
 import java.lang.reflect.Method;
 import java.lang.System.Logger;
+import java.time.Instant;
 import java.util.ResourceBundle;
 import java.util.ListResourceBundle;
 
@@ -37,9 +38,13 @@ public static void main(String[] args) throws Exception {
         assertTrue(args.length == 2);
         String loggerMode = args[0];
         String loggerClassName = args[1];
-
-        testLogger(loggerMode, loggerClassName);
-        testLog(loggerClassName);
+        System.err.println("TestB starting at " + Instant.now());
+        try {
+            testLogger(loggerMode, loggerClassName);
+            testLog(loggerClassName);
+        } finally {
+            System.err.println("TestB finished at " + Instant.now());
+        }
     }
 
     /*