8297215: Update libs tests to use @enablePreview

Reviewed-by: alanb, sspitsyn
This commit is contained in:
Joe Darcy 2022-12-01 20:38:16 +00:00
parent c69aa42d02
commit 770ff5a812
35 changed files with 99 additions and 89 deletions

@ -24,8 +24,8 @@
/**
* @test
* @summary Unit test for Thread.Builder
* @compile --enable-preview -source ${jdk.version} BuilderTest.java
* @run testng/othervm --enable-preview BuilderTest
* @enablePreview
* @run testng BuilderTest
*/
import java.util.concurrent.*;

@ -24,8 +24,8 @@
/**
* @test
* @summary Test that virtual threads are GC'ed
* @compile --enable-preview -source ${jdk.version} Collectable.java
* @run testng/othervm --enable-preview Collectable
* @enablePreview
* @run testng Collectable
*/
import java.lang.ref.WeakReference;

@ -26,8 +26,8 @@
* @summary Test virtual threads using a custom scheduler
* @requires vm.continuations
* @modules java.base/java.lang:+open
* @compile --enable-preview -source ${jdk.version} CustomScheduler.java
* @run testng/othervm --enable-preview CustomScheduler
* @enablePreview
* @run testng CustomScheduler
*/
import java.lang.reflect.Field;

@ -26,8 +26,8 @@
* @summary Test Thread.getStackTrace to examine the stack trace of a virtual
* thread and its carrier
* @modules java.base/java.lang:+open
* @compile --enable-preview -source ${jdk.version} GetStackTrace.java
* @run testng/othervm --enable-preview GetStackTrace
* @enablePreview
* @run testng GetStackTrace
*/
import java.util.Objects;

@ -25,8 +25,8 @@
* @test
* @summary Test Thread::getStackTrace on a virtual thread that is runnable-unmounted
* @requires vm.continuations
* @compile --enable-preview -source ${jdk.version} GetStackTraceWhenRunnable.java
* @run main/othervm --enable-preview -Djdk.virtualThreadScheduler.maxPoolSize=1 GetStackTraceWhenRunnable
* @enablePreview
* @run main/othervm -Djdk.virtualThreadScheduler.maxPoolSize=1 GetStackTraceWhenRunnable
*/
import java.io.IOException;

@ -26,8 +26,8 @@
* @summary Test Thread.holdsLock when lock held by carrier thread
* @requires vm.continuations
* @modules java.base/java.lang:+open
* @compile --enable-preview -source ${jdk.version} HoldsLock.java
* @run testng/othervm --enable-preview HoldsLock
* @enablePreview
* @run testng HoldsLock
*/
/**
@ -35,8 +35,7 @@
* @summary Test Thread.holdsLock when lock held by carrier thread
* @requires vm.continuations & vm.debug
* @modules java.base/java.lang:+open
* @compile --enable-preview -source ${jdk.version} HoldsLock.java
* @run testng/othervm --enable-preview -XX:+UseHeavyMonitors HoldsLock
* @run testng/othervm -XX:+UseHeavyMonitors HoldsLock
*/
import java.lang.management.LockInfo;

@ -26,8 +26,8 @@
* @summary Basic test for JFR jdk.VirtualThreadXXX events
* @requires vm.continuations
* @modules jdk.jfr java.base/java.lang:+open
* @compile --enable-preview -source ${jdk.version} JfrEvents.java
* @run testng/othervm --enable-preview JfrEvents
* @enablePreview
* @run testng/othervm JfrEvents
*/
import java.io.IOException;

@ -25,8 +25,8 @@
* @test
* @summary Test virtual threads using java.util.concurrent locks
* @library /test/lib
* @compile --enable-preview -source ${jdk.version} Locking.java
* @run testng/othervm --enable-preview Locking
* @enablePreview
* @run testng Locking
*/
import java.util.concurrent.atomic.AtomicBoolean;

@ -26,8 +26,8 @@
* @summary Test virtual thread park when scheduler is a fixed thread pool
* @requires vm.continuations
* @modules java.base/java.lang:+open
* @compile --enable-preview -source ${jdk.version} ParkWithFixedThreadPool.java
* @run testng/othervm --enable-preview ParkWithFixedThreadPool
* @enablePreview
* @run testng ParkWithFixedThreadPool
*/
import java.util.concurrent.*;
import java.util.concurrent.atomic.*;

@ -25,8 +25,8 @@
* @test
* @summary Test virtual threads using park/unpark
* @library /test/lib
* @compile --enable-preview -source ${jdk.version} Parking.java
* @run testng/othervm --enable-preview Parking
* @enablePreview
* @run testng Parking
*/
import java.time.Duration;

@ -26,8 +26,8 @@
* @summary Test virtual threads using core reflection
* @modules java.base/java.lang:+open
* @library /test/lib
* @compile --enable-preview -source ${jdk.version} Reflection.java
* @run testng/othervm --enable-preview Reflection
* @enablePreview
* @run testng Reflection
*/
import java.lang.reflect.Constructor;

@ -25,8 +25,8 @@
* @test
* @library /test/lib
* @summary Shutdown hook is called with virtual thread
* @compile --enable-preview -source ${jdk.version} ShutdownHook.java
* @run main/othervm --enable-preview ShutdownHook test
* @enablePreview
* @run main ShutdownHook test
*/
import jdk.test.lib.process.OutputAnalyzer;

@ -28,9 +28,9 @@
* @requires vm.continuations
* @modules java.management
* @library /test/lib
* @compile --enable-preview -source ${jdk.version} StackTraces.java
* @run testng/othervm --enable-preview StackTraces
* @run testng/othervm --enable-preview -XX:+UnlockDiagnosticVMOptions -XX:+ShowCarrierFrames StackTraces
* @enablePreview
* @run testng StackTraces
* @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:+ShowCarrierFrames StackTraces
*/
import java.lang.management.ManagementFactory;

@ -25,8 +25,8 @@
* @test
* @summary Test Virtual threads using thread locals
* @library /test/lib
* @compile --enable-preview -source ${jdk.version} ThreadLocals.java
* @run testng/othervm --enable-preview ThreadLocals
* @enablePreview
* @run testng ThreadLocals
*/
import jdk.test.lib.thread.VThreadRunner;

@ -25,8 +25,8 @@
* @test
* @summary Test virtual threads using Object.wait/notifyAll
* @library /test/lib
* @compile --enable-preview -source ${jdk.version} WaitNotify.java
* @run testng/othervm --enable-preview WaitNotify
* @enablePreview
* @run testng WaitNotify
*/
import java.util.concurrent.Semaphore;

@ -26,17 +26,17 @@
* @summary Stress test asynchronous Thread.getStackTrace
* @requires vm.debug != true & vm.continuations
* @modules java.base/java.lang:+open
* @compile --enable-preview -source ${jdk.version} GetStackTraceALot.java ../ThreadBuilders.java
* @run main/othervm --enable-preview GetStackTraceALot
*
* @enablePreview
* @compile GetStackTraceALot.java ../ThreadBuilders.java
* @run main GetStackTraceALot
*/
/**
* @test
* @requires vm.debug == true & vm.continuations
* @modules java.base/java.lang:+open
* @compile --enable-preview -source ${jdk.version} GetStackTraceALot.java ../ThreadBuilders.java
* @run main/othervm/timeout=300 --enable-preview GetStackTraceALot 1000
* @compile GetStackTraceALot.java ../ThreadBuilders.java
* @run main/timeout=300 GetStackTraceALot 1000
*/
import java.time.Duration;

@ -37,8 +37,9 @@ import static org.testng.Assert.fail;
/**
* @test
* @compile --enable-preview -source ${jdk.version} SwitchBootstrapsTest.java
* @run testng/othervm --enable-preview SwitchBootstrapsTest
* @enablePreview
* @compile SwitchBootstrapsTest.java
* @run testng/othervm SwitchBootstrapsTest
*/
@Test
public class SwitchBootstrapsTest {

@ -26,8 +26,9 @@
* @bug 8221481
* @library /test/lib
* @build jdk.test.lib.Utils
* @compile --enable-preview -source ${jdk.version} Timeouts.java
* @run testng/othervm/timeout=180 --enable-preview Timeouts
* @enablePreview
* @compile Timeouts.java
* @run testng/othervm/timeout=180 Timeouts
* @summary Test Socket timeouts
*/

@ -28,12 +28,11 @@
* @requires vm.debug != true
* @modules jdk.httpserver
* @library /test/lib
* @compile --enable-preview -source ${jdk.version} HttpALot.java
* @enablePreview
* @comment This test runs with -Dsun.net.httpserver.nodelay=true to enable TCP_NODELAY on the
* sockets "accept()"ed by the HttpServer. This is to avoid occasional 40ms delays
* receiving responses from the server on Linux.
* @run main/othervm/timeout=600
* --enable-preview
* -Dsun.net.httpserver.nodelay=true
* -Dsun.net.client.defaultConnectTimeout=5000
* -Dsun.net.client.defaultReadTimeout=5000

@ -25,8 +25,9 @@
* @test
* @summary Test that HTTP connections can be interrupted
* @library /test/lib
* @compile --enable-preview -source ${jdk.version} InterruptHttp.java
* @run main/othervm --enable-preview InterruptHttp
* @enablePreview
* @compile InterruptHttp.java
* @run main/othervm InterruptHttp
*/
import java.io.Closeable;

@ -30,13 +30,14 @@
* @modules java.base/jdk.internal.vm
* @build java.base/java.lang.StackWalkerHelper
*
* @run testng/othervm --enable-preview -Xint Basic
* @enablePreview
* @run testng/othervm -Xint Basic
*
* @run testng/othervm --enable-preview -Xcomp -XX:TieredStopAtLevel=3 -XX:CompileOnly=jdk/internal/vm/Continuation,Basic Basic
* @run testng/othervm --enable-preview -Xcomp -XX:-TieredCompilation -XX:CompileOnly=jdk/internal/vm/Continuation,Basic Basic
* @run testng/othervm --enable-preview -Xcomp -XX:-TieredCompilation -XX:CompileOnly=jdk/internal/vm/Continuation,Basic -XX:CompileCommand=exclude,Basic.manyArgsDriver Basic
* @run testng/othervm --enable-preview -Xcomp -XX:-TieredCompilation -XX:CompileOnly=jdk/internal/vm/Continuation,Basic -XX:CompileCommand=exclude,jdk/internal/vm/Continuation.enter Basic
* @run testng/othervm --enable-preview -Xcomp -XX:-TieredCompilation -XX:CompileOnly=jdk/internal/vm/Continuation,Basic -XX:CompileCommand=inline,jdk/internal/vm/Continuation.run Basic
* @run testng/othervm -Xcomp -XX:TieredStopAtLevel=3 -XX:CompileOnly=jdk/internal/vm/Continuation,Basic Basic
* @run testng/othervm -Xcomp -XX:-TieredCompilation -XX:CompileOnly=jdk/internal/vm/Continuation,Basic Basic
* @run testng/othervm -Xcomp -XX:-TieredCompilation -XX:CompileOnly=jdk/internal/vm/Continuation,Basic -XX:CompileCommand=exclude,Basic.manyArgsDriver Basic
* @run testng/othervm -Xcomp -XX:-TieredCompilation -XX:CompileOnly=jdk/internal/vm/Continuation,Basic -XX:CompileCommand=exclude,jdk/internal/vm/Continuation.enter Basic
* @run testng/othervm -Xcomp -XX:-TieredCompilation -XX:CompileOnly=jdk/internal/vm/Continuation,Basic -XX:CompileCommand=inline,jdk/internal/vm/Continuation.run Basic
*/
/**
@ -46,9 +47,9 @@
* @modules java.base/jdk.internal.vm
* @build java.base/java.lang.StackWalkerHelper
*
* @run testng/othervm --enable-preview -XX:+VerifyStack -Xint Basic
* @run testng/othervm --enable-preview -XX:+VerifyStack -Xcomp -XX:TieredStopAtLevel=3 -XX:CompileOnly=jdk/internal/vm/Continuation,Basic Basic
* @run testng/othervm --enable-preview -XX:+VerifyStack -Xcomp -XX:-TieredCompilation -XX:CompileOnly=jdk/internal/vm/Continuation,Basic Basic
* @run testng/othervm -XX:+VerifyStack -Xint Basic
* @run testng/othervm -XX:+VerifyStack -Xcomp -XX:TieredStopAtLevel=3 -XX:CompileOnly=jdk/internal/vm/Continuation,Basic Basic
* @run testng/othervm -XX:+VerifyStack -Xcomp -XX:-TieredCompilation -XX:CompileOnly=jdk/internal/vm/Continuation,Basic Basic
*/
import jdk.internal.vm.Continuation;

@ -26,10 +26,11 @@
* @summary Tests class unloading on virtual threads
*
* @requires vm.continuations
* @compile --enable-preview -source ${jdk.version} ClassUnloading.java
* @run main/othervm --enable-preview -XX:-UseCompressedOops ClassUnloading
* @run main/othervm --enable-preview -XX:+UseCompressedOops ClassUnloading
* @run main/othervm --enable-preview -Xcomp -XX:-TieredCompilation -XX:CompileOnly=jdk/internal/vm/Continuation,ClassUnloading ClassUnloading
* @enablePreview
* @compile ClassUnloading.java
* @run main/othervm -XX:-UseCompressedOops ClassUnloading
* @run main/othervm -XX:+UseCompressedOops ClassUnloading
* @run main/othervm -Xcomp -XX:-TieredCompilation -XX:CompileOnly=jdk/internal/vm/Continuation,ClassUnloading ClassUnloading
*/
// @run testng/othervm -Xcomp -XX:-TieredCompilation -XX:CompileOnly=jdk/internal/vm/Continuation,Basic Basic

@ -28,9 +28,10 @@
* @modules java.base/jdk.internal.vm
*
* @requires vm.gc.G1
* @run main/othervm --enable-preview -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyContinuations -Xms2g -Xmx2g -XX:+UseG1GC -XX:G1HeapRegionSize=1m -Xss10m -Xint HumongousStack 5000
* @run main/othervm --enable-preview -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyContinuations -Xms2g -Xmx2g -XX:+UseG1GC -XX:G1HeapRegionSize=1m -Xss10m -Xcomp -XX:TieredStopAtLevel=3 -XX:CompileOnly=jdk/internal/vm/Continuation,HumongousStack HumongousStack 10000
* @run main/othervm --enable-preview -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyContinuations -Xms2g -Xmx2g -XX:+UseG1GC -XX:G1HeapRegionSize=1m -Xss10m -Xcomp -XX:-TieredCompilation -XX:CompileOnly=jdk/internal/vm/Continuation,HumongousStack HumongousStack 10000
* @enablePreview
* @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyContinuations -Xms2g -Xmx2g -XX:+UseG1GC -XX:G1HeapRegionSize=1m -Xss10m -Xint HumongousStack 5000
* @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyContinuations -Xms2g -Xmx2g -XX:+UseG1GC -XX:G1HeapRegionSize=1m -Xss10m -Xcomp -XX:TieredStopAtLevel=3 -XX:CompileOnly=jdk/internal/vm/Continuation,HumongousStack HumongousStack 10000
* @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyContinuations -Xms2g -Xmx2g -XX:+UseG1GC -XX:G1HeapRegionSize=1m -Xss10m -Xcomp -XX:-TieredCompilation -XX:CompileOnly=jdk/internal/vm/Continuation,HumongousStack HumongousStack 10000
*/
import jdk.internal.vm.Continuation;

@ -27,10 +27,10 @@
* @requires vm.continuations
* @build java.base/java.lang.LiveFrames
* @modules java.base/jdk.internal.vm
*
* @run main/othervm --enable-preview -XX:+UnlockDiagnosticVMOptions -Xint LiveFramesDriver
* @run main/othervm --enable-preview -XX:+UnlockDiagnosticVMOptions -XX:-TieredCompilation -Xcomp -XX:CompileOnly=jdk/internal/vm/Continuation,java/lang/LiveFrames LiveFramesDriver
* @run main/othervm --enable-preview -XX:+UnlockDiagnosticVMOptions -XX:+TieredCompilation -XX:TieredStopAtLevel=3 -Xcomp -XX:CompileOnly=jdk/internal/vm/Continuation,java/lang/LiveFrames LiveFramesDriver
* @enablePreview
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -Xint LiveFramesDriver
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:-TieredCompilation -Xcomp -XX:CompileOnly=jdk/internal/vm/Continuation,java/lang/LiveFrames LiveFramesDriver
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+TieredCompilation -XX:TieredStopAtLevel=3 -Xcomp -XX:CompileOnly=jdk/internal/vm/Continuation,java/lang/LiveFrames LiveFramesDriver
*/

@ -27,9 +27,9 @@
* @requires vm.continuations
* @modules java.base/jdk.internal.vm
* @build java.base/java.lang.StackWalkerHelper
*
* @run testng/othervm --enable-preview -Xint Scoped
* @run testng/othervm --enable-preview -Xcomp -XX:CompileOnly=jdk/internal/vm/Continuation,Scoped Scoped
* @enablePreview
* @run testng/othervm -Xint Scoped
* @run testng/othervm -Xcomp -XX:CompileOnly=jdk/internal/vm/Continuation,Scoped Scoped
*/
import jdk.internal.vm.Continuation;

@ -37,8 +37,9 @@ import jdk.test.lib.jfr.Events;
* @key jfr
* @requires vm.hasJFR & vm.continuations
* @library /test/lib
* @compile --enable-preview -source ${jdk.version} TestThreadEndEvent.java LatchedThread.java
* @run main/othervm --enable-preview jdk.jfr.event.runtime.TestThreadEndEvent
* @enablePreview
* @compile TestThreadEndEvent.java LatchedThread.java
* @run main/othervm jdk.jfr.event.runtime.TestThreadEndEvent
*/
public class TestThreadEndEvent {
private final static String EVENT_NAME_THREAD_END = EventNames.ThreadEnd;

@ -40,8 +40,8 @@ import jdk.test.lib.jfr.Events;
* @key jfr
* @requires vm.hasJFR & vm.continuations
* @library /test/lib
* @compile --enable-preview -source ${jdk.version} TestThreadSleepEvent.java
* @run main/othervm --enable-preview jdk.jfr.event.runtime.TestThreadSleepEvent
* @enablePreview
* @run main/othervm jdk.jfr.event.runtime.TestThreadSleepEvent
*/
public class TestThreadSleepEvent {

@ -37,8 +37,9 @@ import jdk.test.lib.jfr.Events;
* @key jfr
* @requires vm.hasJFR & vm.continuations
* @library /test/lib
* @compile --enable-preview -source ${jdk.version} TestThreadStartEvent.java LatchedThread.java
* @run main/othervm --enable-preview jdk.jfr.event.runtime.TestThreadStartEvent
* @enablePreview
* @compile TestThreadStartEvent.java LatchedThread.java
* @run main/othervm jdk.jfr.event.runtime.TestThreadStartEvent
*/
public class TestThreadStartEvent {
private final static String EVENT_NAME_THREAD_START = EventNames.ThreadStart;

@ -37,8 +37,9 @@ import jdk.test.lib.jfr.Events;
* @key jfr
* @requires vm.hasJFR & vm.continuations
* @library /test/lib
* @compile --enable-preview -source ${jdk.version} TestVirtualThreadEndEvent.java LatchedThread.java
* @run main/othervm --enable-preview jdk.jfr.event.runtime.TestVirtualThreadEndEvent
* @enablePreview
* @compile TestVirtualThreadEndEvent.java LatchedThread.java
* @run main/othervm jdk.jfr.event.runtime.TestVirtualThreadEndEvent
*/
public class TestVirtualThreadEndEvent {
private final static String EVENT_NAME_THREAD_END = EventNames.VirtualThreadEnd;

@ -37,8 +37,9 @@ import jdk.test.lib.jfr.Events;
* @key jfr
* @requires vm.hasJFR & vm.continuations
* @library /test/lib
* @compile --enable-preview -source ${jdk.version} TestVirtualThreadStartEvent.java LatchedThread.java
* @run main/othervm --enable-preview jdk.jfr.event.runtime.TestVirtualThreadStartEvent
* @enablePreview
* @compile TestVirtualThreadStartEvent.java LatchedThread.java
* @run main/othervm jdk.jfr.event.runtime.TestVirtualThreadStartEvent
*/
public class TestVirtualThreadStartEvent {
private final static String EVENT_NAME_THREAD_START = EventNames.VirtualThreadStart;

@ -42,8 +42,9 @@ import static jdk.test.lib.Asserts.assertTrue;
* @requires vm.hasJFR & vm.continuations
* @library /test/lib
* @modules jdk.jfr/jdk.jfr.internal
* @compile --enable-preview -source ${jdk.version} TestThreadExclusion.java LatchedThread.java
* @run main/othervm --enable-preview jdk.jfr.jvm.TestThreadExclusion
* @enablePreview
* @compile TestThreadExclusion.java LatchedThread.java
* @run main/othervm jdk.jfr.jvm.TestThreadExclusion
*/
/**

@ -42,8 +42,9 @@ import static jdk.test.lib.Asserts.assertTrue;
* @requires vm.hasJFR & vm.continuations
* @library /test/lib
* @modules jdk.jfr/jdk.jfr.internal
* @compile --enable-preview -source ${jdk.version} TestVirtualThreadExclusion.java LatchedThread.java
* @run main/othervm --enable-preview jdk.jfr.jvm.TestVirtualThreadExclusion
* @enablePreview
* @compile TestVirtualThreadExclusion.java LatchedThread.java
* @run main/othervm jdk.jfr.jvm.TestVirtualThreadExclusion
*/
/**

@ -42,8 +42,8 @@ import jdk.test.lib.jfr.Events;
* @requires vm.hasJFR & vm.continuations
* @library /test/lib /test/jdk
* @modules jdk.jfr/jdk.jfr.internal
* @compile --enable-preview -source ${jdk.version} TestDeepVirtualStackTrace.java
* @run main/othervm --enable-preview -XX:FlightRecorderOptions:stackdepth=2048
* @enablePreview
* @run main/othervm -XX:FlightRecorderOptions:stackdepth=2048
* jdk.jfr.threading.TestDeepVirtualStackTrace
*/
public class TestDeepVirtualStackTrace {

@ -43,8 +43,8 @@ import jdk.test.lib.Asserts;
* @requires vm.hasJFR & vm.continuations
* @library /test/lib /test/jdk
* @modules jdk.jfr/jdk.jfr.internal
* @compile --enable-preview -source ${jdk.version} TestManyVirtualThreads.java
* @run main/othervm --enable-preview jdk.jfr.threading.TestManyVirtualThreads
* @enablePreview
* @run main/othervm jdk.jfr.threading.TestManyVirtualThreads
*/
public class TestManyVirtualThreads {

@ -41,8 +41,8 @@ import jdk.test.lib.jfr.Events;
* @requires vm.hasJFR & vm.continuations
* @library /test/lib /test/jdk
* @modules jdk.jfr/jdk.jfr.internal
* @compile --enable-preview -source ${jdk.version} TestNestedVirtualThreads.java
* @run main/othervm --enable-preview jdk.jfr.threading.TestNestedVirtualThreads
* @enablePreview
* @run main/othervm jdk.jfr.threading.TestNestedVirtualThreads
*/
public class TestNestedVirtualThreads {
@Name("test.Nested")