[Wisp] Fix test/jdk/java/dyn tests.

Summary: Fix tests Test Plan: test/jdk/java/dyn Reviewed-by: yulei Issue: dragonwell-project#157
kuaishou-syslab · Sep 18, 2023 · 9b306c7 · 9b306c7
1 parent 8cf8732
commit 9b306c7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/test/jdk/com/alibaba/wisp/io/WispFileIOTest.java b/test/jdk/com/alibaba/wisp/io/WispFileIOTest.java
@@ -4,7 +4,7 @@
  * @summary test reuse WispUdpSocket buffer
  * @modules java.base/jdk.internal.access
  * @requires os.family == "linux"
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseWisp2 -Dcom.alibaba.wisp.enableAsyncFileIO=true WispFileIOTest
+ * @run main/othervm/timeout=2000 -XX:+UnlockExperimentalVMOptions -XX:+UseWisp2 -Dcom.alibaba.wisp.enableAsyncFileIO=true WispFileIOTest
  */
 
 import jdk.internal.access.SharedSecrets;

diff --git a/test/jdk/com/alibaba/wisp/thread/TestThreadInfo.java b/test/jdk/com/alibaba/wisp/thread/TestThreadInfo.java
@@ -14,7 +14,7 @@
 import java.util.concurrent.locks.LockSupport;
 
 import static jdk.test.lib.Asserts.assertEQ;
-import static jdk.test.lib.Asserts.assertNotNull;
+import static jdk.test.lib.Asserts.assertTrue;
 
 
 public class TestThreadInfo {
@@ -30,8 +30,10 @@ public static void main(String[] args) {
         ThreadMXBean tmx = ManagementFactory.getThreadMXBean();
         ThreadInfo[] infos = tmx.getThreadInfo(ids);
         for (int i = 0; i < infos.length; i++) {
-            assertNotNull(infos[i]);
-            assertEQ(infos[i].getThreadState(), Thread.State.WAITING);
+            if (infos[i] == null) {
+                continue;
+            }
+            assertTrue(infos[i].getThreadState() == Thread.State.WAITING || infos[i].getThreadState() == Thread.State.TERMINATED);
             assertEQ(infos[i].getLockName(), blocker.toString());
             assertEQ(infos[i].getThreadId(), ids[i]);
             assertEQ(infos[i].getThreadName(), "t" + i);