[Misc] Fix jtreg tests compilation failed in previous commit.

Summary: Fix jtreg tests compilation failed in previous commit. Test Plan: all wisp cases Reviewed-by: yulei Issue: #83
dragonwell-project · Jul 7, 2023 · cfca576 · cfca576
1 parent b94ac91
commit cfca576
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 17 deletions.
diff --git a/src/hotspot/share/runtime/coroutine.cpp b/src/hotspot/share/runtime/coroutine.cpp
@@ -22,7 +22,6 @@
  *
  */
 
-#include "classfile/vmClasses.hpp"
 #include "precompiled.hpp"
 #include "classfile/vmSymbols.hpp"
 #include "interpreter/linkResolver.hpp"

diff --git a/test/jdk/com/alibaba/wisp/WorkerContainerTest.java b/test/jdk/com/alibaba/wisp/WorkerContainerTest.java
@@ -1,6 +1,6 @@
 /*
  * @test
- * @library /lib/testlibrary
+ * @library /test/lib
  * @summary Test wisp worker thread isn't created without -Dcom.alibaba.wisp.transparentWispSwitch=true
  * @run main/othervm -XX:ActiveProcessorCount=2 WorkerContainerTest
  */
@@ -14,7 +14,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static jdk.testlibrary.Asserts.assertFalse;
+import static jdk.test.lib.Asserts.assertFalse;
 
 public class WorkerContainerTest {
 

diff --git a/test/jdk/com/alibaba/wisp/io/BlockingAccept2Test.java b/test/jdk/com/alibaba/wisp/io/BlockingAccept2Test.java
@@ -1,6 +1,6 @@
 /*
  * @test
- * @library /lib/testlibrary
+ * @library /test/lib
  * @summary test blocking accept
  * @run main/othervm -Dcom.alibaba.wisp.carrierEngines=1 -XX:+UseWisp2 BlockingAccept2Test
  */

diff --git a/test/jdk/com/alibaba/wisp/io/ShareFdTest.java b/test/jdk/com/alibaba/wisp/io/ShareFdTest.java
@@ -1,6 +1,6 @@
 /*
  * @test
- * @library /lib/testlibrary
+ * @library /test/lib
  * @summary test support fd use acorss coroutines
  * @run main/othervm -XX:+EnableCoroutine -Dcom.alibaba.wisp.transparentWispSwitch=true  -Dcom.alibaba.wisp.version=1  ShareFdTest
  * @run main/othervm -XX:+EnableCoroutine -Dcom.alibaba.wisp.transparentWispSwitch=true  -Dcom.alibaba.wisp.version=2  ShareFdTest
@@ -11,7 +11,7 @@
 import java.net.Socket;
 
 
-import static jdk.testlibrary.Asserts.assertTrue;
+import static jdk.test.lib.Asserts.assertTrue;
 
 public class ShareFdTest {
     private static boolean success = true;

diff --git a/test/jdk/com/alibaba/wisp/io/WispSocketCloseTest.java b/test/jdk/com/alibaba/wisp/io/WispSocketCloseTest.java
@@ -1,6 +1,6 @@
 /*
  * @test
- * @library /lib/testlibrary
+ * @library /test/lib
  * @summary test close will wake up blocking wispTask
  * @run main/othervm -XX:+EnableCoroutine -Dcom.alibaba.wisp.transparentWispSwitch=true  -Dcom.alibaba.wisp.version=1  WispSocketCloseTest
  * @run main/othervm -XX:+EnableCoroutine -Dcom.alibaba.wisp.transparentWispSwitch=true  -Dcom.alibaba.wisp.version=1  -Dcom.alibaba.globalPoller=false WispSocketCloseTest
@@ -12,7 +12,7 @@
 import java.nio.channels.ClosedChannelException;
 
 
-import static jdk.testlibrary.Asserts.assertTrue;
+import static jdk.test.lib.Asserts.assertTrue;
 
 
 public class WispSocketCloseTest {

diff --git a/test/jdk/com/alibaba/wisp/thread/PreemptTest.java b/test/jdk/com/alibaba/wisp/thread/PreemptTest.java
@@ -1,7 +1,7 @@
 /*
  * @test
  * @summary test wisp time slice preempt
- * @library /lib/testlibrary
+ * @library /test/lib
  * @run main/othervm -XX:+EnableCoroutine -Dcom.alibaba.wisp.transparentWispSwitch=true -Dcom.alibaba.wisp.carrierEngines=1 -Dcom.alibaba.wisp.enableHandOff=true -Dcom.alibaba.wisp.version=2 PreemptTest
 
  */
@@ -14,7 +14,7 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import static jdk.testlibrary.Asserts.assertTrue;
+import static jdk.test.lib.Asserts.assertTrue;
 
 public class PreemptTest {
     public static void main(String[] args) throws Exception {

diff --git a/test/jdk/com/alibaba/wisp2/HandOffWithStealTest.java b/test/jdk/com/alibaba/wisp2/HandOffWithStealTest.java
@@ -1,6 +1,6 @@
 /*
  * @test
- * @library /lib/testlibrary
+ * @library /test/lib
  * @summary test long running or blocking syscall task could be retaken
  * @run main/othervm -Dcom.alibaba.wisp.carrierEngines=2 -XX:+UseWisp2 -Dcom.alibaba.wisp.enableHandOff=true -Dcom.alibaba.wisp.sysmonTickUs=100000 -Dcom.alibaba.wisp.handoffPolicy=ADAPTIVE HandOffWithStealTest
  */
@@ -15,7 +15,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import static jdk.testlibrary.Asserts.assertTrue;
+import static jdk.test.lib.Asserts.assertTrue;
 
 public class HandOffWithStealTest {
     public static void main(String[] args) throws Exception {

diff --git a/test/jdk/com/alibaba/wisp2/bug/IsInNativeTest.java b/test/jdk/com/alibaba/wisp2/bug/IsInNativeTest.java
@@ -1,20 +1,20 @@
 /*
  * @test
- * @library /lib/testlibrary
+ * @library /test/lib
  * @summary test Thread.isInNative() is correct
- * @modules java.base/jdk.internal.misc
+ * @modules java.base/jdk.internal.access
  * @run main/othervm -XX:+EnableCoroutine IsInNativeTest
  */
 
-import jdk.internal.misc.SharedSecrets;
+import jdk.internal.access.SharedSecrets;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
 import java.nio.channels.SocketChannel;
 
-import static jdk.testlibrary.Asserts.assertFalse;
-import static jdk.testlibrary.Asserts.assertTrue;
+import static jdk.test.lib.Asserts.assertFalse;
+import static jdk.test.lib.Asserts.assertTrue;
 
 public class IsInNativeTest {
     public static void main(String[] args) throws Exception {