From 55e7af0560335ef69af072cee60956cf8e6d00a1 Mon Sep 17 00:00:00 2001 From: Leo Korinth Date: Tue, 2 Sep 2025 07:27:12 +0000 Subject: [PATCH] 8260555: Change the default TIMEOUT_FACTOR from 4 to 1 Reviewed-by: alanb, sspitsyn, lmesnik, ihse --- doc/testing.html | 11 ++- doc/testing.md | 10 +-- make/RunTests.gmk | 3 +- .../arguments/TestCompileTaskTimeout.java | 2 +- .../arraycopy/stress/TestStressArrayCopy.java | 2 +- .../compiler/c1/TestConcurrentPatching.java | 4 +- .../compiler/c1/TestPinnedIntrinsics.java | 4 +- .../jtreg/compiler/c2/TestMergeStores.java | 6 +- .../c2/TestScalarReplacementMaxLiveNodes.java | 6 +- .../compiler/c2/TestStressRecompilation.java | 4 +- .../TestOverloadCompileQueues.java | 6 +- .../TestAntiDependenciesHighMemUsage2.java | 2 +- .../aes/TestCipherBlockChainingEncrypt.java | 4 +- .../TestLoadBypassesClassCast.java | 2 +- .../floatingpoint/TestFloatSyncJNIArgs.java | 2 +- .../intrinsics/TestLongUnsignedDivMod.java | 4 +- .../ContinuousCallSiteTargetChange.java | 4 +- ...fineMethodUsedByMultipleMethodHandles.java | 2 +- .../vm/ci/runtime/test/RedefineClassTest.java | 4 +- .../runtime/test/TestResolvedJavaMethod.java | 4 +- .../loopopts/TestMaxLoopOptsCountReached.java | 4 +- ...rtialPeelAtUnsignedTestsNegativeLimit.java | 10 +-- .../loopopts/superword/ProdRed_Double.java | 4 +- .../loopopts/superword/ProdRed_Float.java | 4 +- .../loopopts/superword/ProdRed_Int.java | 2 +- .../superword/SumRedAbsNeg_Double.java | 4 +- .../superword/SumRedAbsNeg_Float.java | 2 +- .../loopopts/superword/SumRedSqrt_Double.java | 2 +- .../loopopts/superword/SumRed_Double.java | 2 +- .../loopopts/superword/SumRed_Float.java | 2 +- .../loopopts/superword/SumRed_Int.java | 2 +- .../superword/TestDependencyOffsets.java | 68 +++++++++---------- .../superword/TestEquivalentInvariants.java | 2 +- .../superword/TestMovingLoadBeforeStore.java | 13 ++-- .../loopstripmining/CheckLoopStripMining.java | 2 +- .../profiling/TestProfileCounterOverflow.java | 4 +- .../spectrapredefineclass/Launcher.java | 10 +-- .../Launcher.java | 10 +-- .../tiered/Level2RecompilationTest.java | 5 +- .../compiler/uncommontrap/TestDeoptOOM.java | 6 +- .../vectorapi/TestRawOopAtSafepoint.java | 5 +- .../TestFloat16VectorOperations.java | 2 +- .../vectorization/TestVectorZeroCount.java | 2 +- .../g1/TestGreyReclaimedHumongousObjects.java | 4 +- .../TestHumongousClassLoader.java | 10 +-- .../TestHumongousNonArrayAllocation.java | 12 ++-- .../jtreg/gc/g1/ihop/TestIHOPErgo.java | 4 +- .../gc/stress/TestMultiThreadStressRSet.java | 4 +- .../stress/TestReclaimStringsLeaksMemory.java | 10 +-- .../gc/stress/TestStressG1Humongous.java | 10 +-- .../gc/stress/TestStressRSetCoarsening.java | 14 ++-- .../stress/systemgc/TestSystemGCWithG1.java | 4 +- .../systemgc/TestSystemGCWithParallel.java | 4 +- .../systemgc/TestSystemGCWithSerial.java | 4 +- .../systemgc/TestSystemGCWithShenandoah.java | 8 +-- test/hotspot/jtreg/gc/z/TestUncommit.java | 2 +- test/hotspot/jtreg/gtest/GTestWrapper.java | 2 +- .../jtreg/runtime/8176717/TestInheritFD.java | 9 +-- .../CreateMirror/ArraysNewInstanceBug.java | 4 +- .../ErrorHandling/CreateCoredumpOnCrash.java | 4 +- .../InvocationTests/invocationC1Tests.java | 6 +- .../InvocationTests/invokeinterfaceTests.java | 6 +- .../jtreg/runtime/LoadClass/TestResize.java | 4 +- .../runtime/NMT/VirtualAllocCommitMerge.java | 4 +- .../InvokeInterfaceICCE.java | 2 +- .../InvokeInterfaceSuccessTest.java | 2 +- .../InvokeVirtualICCE.java | 2 +- .../InvokeVirtualSuccessTest.java | 2 +- .../TestThreadDumpMonitorContention.java | 4 +- .../jtreg/runtime/cds/DeterministicDump.java | 2 +- .../cds/appcds/LotsOfSyntheticClasses.java | 2 +- .../jtreg/runtime/cds/appcds/TestCommon.java | 32 ++++----- .../aotCode/AOTCodeCompressedOopsTest.java | 4 +- .../appcds/aotProfile/AOTProfileFlags.java | 2 +- .../sharedStrings/SharedStringsStress.java | 2 +- .../ArrayIndexOutOfBoundsExceptionTest.java | 6 +- .../runtime/logging/RedefineClasses.java | 4 +- .../reflect/ReflectOutOfMemoryError.java | 4 +- .../UnmountedVThreadNativeMethodAtTop.java | 2 +- .../MyPackage/HeapMonitorThreadTest.java | 4 +- .../jvmti/SetTag/TagMapTest.java | 8 +-- .../SuspendResume2/SuspendResume2.java | 6 +- .../serviceability/sa/ClhsdbDumpheap.java | 4 +- .../jtreg/serviceability/sa/ClhsdbFindPC.java | 10 +-- .../sa/ClhsdbJstackXcompStress.java | 4 +- .../sa/ClhsdbThreadContext.java | 4 +- .../sa/TestJhsdbJstackLineNumbers.java | 4 +- .../sa/TestObjectAlignment.java | 4 +- .../sa/sadebugd/SADebugDTest.java | 6 +- .../ir_framework/tests/TestNotCompilable.java | 2 +- .../TestDescription.java | 4 +- .../TestDescription.java | 4 +- .../LargeObjects/large001/large001.java | 4 +- .../large002/TestDescription.java | 4 +- .../large003/TestDescription.java | 4 +- .../large004/TestDescription.java | 4 +- .../large005/TestDescription.java | 4 +- .../SoftReference/soft004/soft004.java | 4 +- .../WeakReference/weak004/weak004.java | 4 +- .../CircularListLow/TestDescription.java | 4 +- .../AdaptiveBlocking001.java | 4 +- .../TestDescription.java | 5 +- .../ShrinkGrowMultiJVM.java | 4 +- .../stressHierarchy001/TestDescription.java | 4 +- .../stressHierarchy002/TestDescription.java | 4 +- .../stressHierarchy003/TestDescription.java | 4 +- .../stressHierarchy004/TestDescription.java | 4 +- .../stressHierarchy005/TestDescription.java | 4 +- .../stressHierarchy006/TestDescription.java | 4 +- .../stressHierarchy007/TestDescription.java | 4 +- .../stressHierarchy008/TestDescription.java | 4 +- .../stressHierarchy009/TestDescription.java | 4 +- .../stressHierarchy010/TestDescription.java | 4 +- .../stressHierarchy011/TestDescription.java | 4 +- .../stressHierarchy012/TestDescription.java | 4 +- .../stressHierarchy013/TestDescription.java | 4 +- .../stressHierarchy014/TestDescription.java | 4 +- .../stressHierarchy015/TestDescription.java | 4 +- .../referringObjects001.java | 4 +- .../_itself_/stepEvent004/stepEvent004.java | 2 +- .../thread/thread001/TestDescription.java | 5 +- .../serial/mixed002/TestDescription.java | 5 +- .../holdevents002/TestDescription.java | 5 +- .../rawmnwait001/TestDescription.java | 5 +- .../SP03/sp03t001/TestDescription.java | 5 +- .../SP03/sp03t002/TestDescription.java | 5 +- .../SP04/sp04t001/TestDescription.java | 5 +- .../SP04/sp04t002/TestDescription.java | 5 +- .../SP07/sp07t001/TestDescription.java | 5 +- .../isSuspended/issuspended002.java | 4 +- .../thread/strace001/TestDescription.java | 5 +- .../thread/strace002/TestDescription.java | 5 +- .../thread/strace003/TestDescription.java | 5 +- .../nsk/stress/strace/strace006.java | 4 +- .../nsk/stress/thread/thread001.java | 4 +- .../nsk/stress/thread/thread002.java | 4 +- .../nsk/stress/thread/thread005.java | 4 +- .../nsk/stress/thread/thread006.java | 4 +- .../nsk/stress/thread/thread007.java | 4 +- .../nsk/stress/thread/thread008.java | 4 +- .../vm/stress/btree/btree001/btree001.java | 9 ++- .../vm/stress/btree/btree002/btree002.java | 9 ++- .../vm/stress/btree/btree003/btree003.java | 9 ++- .../vm/stress/btree/btree004/btree004.java | 9 ++- .../vm/stress/btree/btree005/btree005.java | 9 ++- .../vm/stress/btree/btree006/btree006.java | 9 ++- .../vm/stress/btree/btree007/btree007.java | 9 ++- .../vm/stress/btree/btree008/btree008.java | 9 ++- .../vm/stress/btree/btree009/btree009.java | 9 ++- .../vm/stress/btree/btree010/btree010.java | 9 ++- .../vm/stress/btree/btree011/btree011.java | 9 ++- .../vm/stress/btree/btree012/btree012.java | 9 ++- .../TestDescription.java | 3 +- .../meth/stress/compiler/i2c_c2i/Test.java | 2 +- .../meth/stress/compiler/sequences/Test.java | 4 +- .../provider/KeyFactory/TestProviderLeak.java | 8 +-- test/jdk/com/sun/jdi/InterruptHangTest.java | 7 +- .../com/sun/jdi/MethodEntryExitEvents.java | 8 +-- .../jdk/com/sun/jdi/ThreadMemoryLeakTest.java | 4 +- .../sun/jndi/ldap/LdapPoolTimeoutTest.java | 3 +- .../com/sun/nio/sctp/SctpChannel/Connect.java | 3 +- .../SctpServerChannel/NonBlockingAccept.java | 3 +- .../java/awt/font/NumericShaper/MTTest.java | 4 +- .../XMLDecoder/8028054/TestMethodFinder.java | 4 +- test/jdk/java/foreign/StdLibTest.java | 4 +- test/jdk/java/foreign/TestAccessModes.java | 10 +-- .../java/foreign/TestBufferStackStress2.java | 2 +- .../jdk/java/foreign/TestConcurrentClose.java | 4 +- test/jdk/java/foreign/TestDeadlock.java | 2 +- test/jdk/java/foreign/TestMismatch.java | 4 +- .../java/foreign/TestStringEncodingJumbo.java | 4 +- .../java/foreign/TestStubAllocFailure.java | 4 +- test/jdk/java/foreign/TestUpcallStack.java | 2 +- .../loaderLookup/TestLoaderLookup.java | 2 +- .../UnreferencedFISClosesFd.java | 4 +- .../UnreferencedFOSClosesFd.java | 4 +- .../UnreferencedRAFClosesFd.java | 4 +- .../FieldSetAccessibleTest.java | 4 +- test/jdk/java/lang/Math/IntegralPowTest.java | 2 +- .../ProcessBuilder/FDLeakTest/FDLeakTest.java | 6 +- .../lang/ProcessBuilder/UnblockSignals.java | 10 +-- .../lang/StackWalker/LocalsAndOperands.java | 8 +-- .../CompactString/MaxSizeUTF16String.java | 8 +-- .../StringBuilder/CompactStringBuilder.java | 6 +- .../virtual/CancelTimerWithContention.java | 4 +- .../lang/Thread/virtual/MiscMonitorTests.java | 12 ++-- .../lang/Thread/virtual/MonitorEnterExit.java | 10 +-- .../Thread/virtual/MonitorWaitNotify.java | 10 +-- .../jdk/java/lang/Thread/virtual/Parking.java | 8 +-- .../virtual/RetryMonitorEnterWhenPinned.java | 2 +- .../java/lang/Thread/virtual/Starvation.java | 2 +- .../Thread/virtual/SynchronizedNative.java | 8 +-- .../Thread/virtual/ThreadPollOnYield.java | 4 +- .../stress/GetStackTraceALotWhenBlocking.java | 6 +- .../GetStackTraceALotWithTimedWait.java | 7 +- .../lang/Thread/virtual/stress/ParkALot.java | 6 +- .../lang/Thread/virtual/stress/PinALot.java | 4 +- .../lang/Thread/virtual/stress/Skynet.java | 4 +- .../stress/Skynet100kWithMonitors.java | 4 +- .../lang/Thread/virtual/stress/SleepALot.java | 6 +- .../java/lang/annotation/LoaderLeakTest.java | 4 +- .../invoke/TestLambdaFormCustomization.java | 6 +- .../lang/reflect/IllegalArgumentsTest.java | 4 +- .../math/BigInteger/LargeValueExceptions.java | 4 +- .../UnreferencedDatagramSockets.java | 6 +- .../MulticastSocket/SetLoopbackModeIPv4.java | 4 +- .../UnreferencedMulticastSockets.java | 6 +- .../net/ServerSocket/UnreferencedSockets.java | 6 +- test/jdk/java/net/Socket/CloseAvailable.java | 6 +- .../net/httpclient/AsFileDownloadTest.java | 4 +- .../httpclient/BufferingSubscriberTest.java | 4 +- .../net/httpclient/CancelledResponse.java | 6 +- .../net/httpclient/HttpSlowServerTest.java | 4 +- .../jdk/java/net/httpclient/ManyRequests.java | 8 +-- .../httpclient/ResponseBodyBeforeError.java | 4 +- .../net/httpclient/ResponsePublisher.java | 4 +- .../net/httpclient/SpecialHeadersTest.java | 6 +- .../java/net/httpclient/SplitResponse.java | 4 +- .../net/httpclient/SplitResponseAsync.java | 4 +- .../httpclient/SplitResponseKeepAlive.java | 4 +- .../SplitResponseKeepAliveAsync.java | 4 +- .../java/net/httpclient/SplitResponseSSL.java | 4 +- .../net/httpclient/SplitResponseSSLAsync.java | 4 +- .../httpclient/SplitResponseSSLKeepAlive.java | 4 +- .../SplitResponseSSLKeepAliveAsync.java | 4 +- .../httpclient/whitebox/FlowTestDriver.java | 4 +- .../StressLoopback.java | 4 +- .../nio/channels/Channels/TransferTo.java | 4 +- .../Channels/TransferTo_2GB_transferFrom.java | 4 +- .../Channels/TransferTo_2GB_transferTo.java | 4 +- .../nio/channels/FileChannel/CleanerTest.java | 4 +- .../SocketChannel/CloseDuringConnect.java | 4 +- .../nio/channels/SocketChannel/OpenLeak.java | 4 +- .../nio/channels/unixdomain/IOExchanges.java | 4 +- .../channels/vthread/BlockingChannelOps.java | 8 +-- .../transport/dgcDeadLock/DGCDeadLock.java | 7 +- .../jdk/java/security/SignedObject/Chain.java | 4 +- .../Format/DateFormat/DateFormatTest.java | 2 +- .../java/util/HashMap/WhiteBoxResizeTest.java | 4 +- .../CurrencyNameProviderTest.java | 4 +- .../LocaleNameProviderTest.java | 2 +- .../BasicCancelTest.java | 4 +- .../java/util/logging/FileHandlerPath.java | 4 +- .../HandlersOnComplexResetUpdate.java | 11 ++- .../HandlersOnComplexUpdate.java | 11 ++- .../java/util/stream/TEST.properties | 1 + .../tests/java/util/stream/TEST.properties | 1 + test/jdk/java/util/zip/DeInflate.java | 5 +- .../zip/ZipFile/TestZipFileEncodings.java | 4 +- .../ssl/ciphersuites/DisabledAlgorithms.java | 6 +- .../JFileChooser/6868611/bug6868611.java | 4 +- .../ConcurrentModification.java | 4 +- .../parser/Parser/8078268/bug8078268.java | 6 +- .../xml/crypto/dsig/GenerationTests.java | 2 +- test/jdk/jdk/incubator/vector/AddTest.java | 3 +- .../TestDockerMemoryMetricsSubgroup.java | 2 +- .../docker/TestGetFreeSwapSpaceSize.java | 4 +- .../platform/docker/TestLimitsUpdating.java | 4 +- .../platform/docker/TestPidsLimit.java | 4 +- .../internal/vm/Continuation/BasicExt.java | 6 +- .../jdk/internal/vm/Continuation/Fuzz.java | 13 ++-- .../consumer/recordingstream/TestClose.java | 2 +- .../metadata/annotations/TestStackFilter.java | 4 +- .../oldobject/TestEmergencyDumpAtOOM.java | 2 +- .../oldobject/TestObjectDescription.java | 2 +- .../TestCPUTimeSampleMultipleRecordings.java | 2 +- test/jdk/jdk/jfr/jvm/TestModularImage.java | 2 +- .../MonitoredVm/MonitorVmStartTerminate.java | 1 + .../sun/nio/ch/TestMaxCachedBufferSize.java | 12 ++-- .../sun/nio/cs/TestEncoderReplaceUTF16.java | 4 +- test/jdk/sun/security/ec/ed/EdDSATest.java | 4 +- .../security/krb5/config/IncludeRandom.java | 2 +- .../sun/security/krb5/name/Constructors.java | 4 +- .../jdk/sun/security/pkcs11/KDF/TestHKDF.java | 2 +- .../KeyPairGenerator/TestDefaultSize.java | 4 +- .../pkcs11/KeyStore/ImportKeyToP12.java | 2 +- .../pkcs11/Mac/TestLargeSecretKeys.java | 2 +- .../pkcs12/KeytoolOpensslInteropTest.java | 4 +- .../sun/security/provider/acvp/Launcher.java | 4 +- .../ssl/SSLSocketImpl/SSLSocketCloseHang.java | 7 +- .../ssl/X509KeyManager/CertChecking.java | 8 +-- .../tools/jarsigner/ConciseJarsigner.java | 2 +- .../InsufficientSectionDelimiter.java | 4 +- .../tools/jarsigner/RestrictedAlgo.java | 6 +- .../SectionNameContinuedVsLineBreak.java | 4 +- .../tools/jarsigner/TimestampCheck.java | 2 +- .../security/tools/keytool/GenerateAll.java | 4 +- .../sun/security/tools/keytool/ReadJar.java | 4 +- .../keytool/fakecacerts/TrustedCert.java | 4 +- test/jdk/sun/tools/jcmd/TestJcmdSanity.java | 4 +- .../util/resources/TimeZone/Bug8139107.java | 5 +- test/jdk/tools/jlink/JLink100Modules.java | 4 +- test/jdk/tools/jlink/JLink20000Packages.java | 4 +- test/jdk/tools/jlink/JLinkTest.java | 4 +- .../plugins/IncludeLocalesPluginTest.java | 2 +- .../runtimeImage/JavaSEReproducibleTest.java | 2 +- .../tools/jpackage/macosx/DmgContentTest.java | 2 +- .../macosx/MacFileAssociationsTest.java | 2 +- .../tools/jpackage/share/AddLauncherTest.java | 4 +- .../jpackage/share/AppLauncherSubstTest.java | 2 +- .../tools/jpackage/share/AppVersionTest.java | 2 +- test/jdk/tools/jpackage/share/BasicTest.java | 2 +- test/jdk/tools/jpackage/share/IconTest.java | 2 +- .../tools/jpackage/share/InOutPathTest.java | 2 +- .../tools/jpackage/share/InstallDirTest.java | 4 +- .../tools/jpackage/share/JavaOptionsTest.java | 2 +- .../tools/jpackage/share/MainClassTest.java | 2 +- .../jpackage/share/MultiNameTwoPhaseTest.java | 2 +- .../jpackage/share/PostImageScriptTest.java | 2 +- .../jpackage/windows/WinNoRestartTest.java | 4 +- test/jdk/tools/launcher/InstanceMainTest.java | 4 +- .../testLinkOption/TestRedirectLinks.java | 2 +- test/langtools/jdk/jshell/ClassesTest.java | 4 +- .../jdk/jshell/CompletionSuggestionTest.java | 2 +- .../jdk/jshell/HangingRemoteAgent.java | 6 +- .../JdiHangingLaunchExecutionControlTest.java | 4 +- .../JdiHangingListenExecutionControlTest.java | 2 +- .../jdk/jshell/ToolLocalSimpleTest.java | 4 +- test/langtools/jdk/jshell/ToolSimpleTest.java | 4 +- test/langtools/jdk/jshell/UITesting.java | 13 +--- test/langtools/jdk/jshell/VariablesTest.java | 4 +- .../tools/javac/Paths/MineField.java | 4 +- .../tools/javac/Paths/WildcardMineField.java | 4 +- .../tools/javac/diags/CheckExamples.java | 4 +- .../tools/javac/diags/RunExamples.java | 4 +- .../javac/failover/CheckAttributedTree.java | 4 +- .../MultiReleaseJar/MultiReleaseJarTest.java | 4 +- .../GenericConstructorAndDiamondTest.java | 3 +- .../NegativeCyclicDependencyTest.java | 4 +- .../tools/javac/lambda/LambdaParserTest.java | 4 +- .../bridge/template_tests/TEST.properties | 2 + .../IntersectionTargetTypeTest.java | 3 +- .../CreateSymbolsReproducibleTest.java | 2 +- .../javac/tree/JavacTreeScannerTest.java | 4 +- .../javac/tree/SourceDocTreeScannerTest.java | 4 +- .../javac/tree/SourceTreeScannerTest.java | 4 +- .../tools/javac/types/TestComparisons.java | 3 +- .../tools/javac/util/IteratorsTest.java | 4 +- .../tools/javac/varargs/warning/Warn5.java | 4 +- test/langtools/tools/lib/toolbox/ToolBox.java | 12 +--- test/lib/jdk/test/lib/cds/CDSTestUtils.java | 5 +- test/lib/jdk/test/lib/util/ForceGC.java | 9 +-- 342 files changed, 810 insertions(+), 850 deletions(-) create mode 100644 test/jdk/java/util/stream/boottest/java.base/java/util/stream/TEST.properties create mode 100644 test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/TEST.properties diff --git a/doc/testing.html b/doc/testing.html index fa774aa312f..89a9b1b23b7 100644 --- a/doc/testing.html +++ b/doc/testing.html @@ -398,7 +398,8 @@ TEST_OPTS keywords.

JOBS

Currently only applies to JTReg.

TIMEOUT_FACTOR

-

Currently only applies to JTReg.

+

Currently only applies to JTReg +-timeoutFactor.

JAVA_OPTIONS

Applies to JTReg, GTest and Micro.

VM_OPTIONS

@@ -444,8 +445,12 @@ otherwise it defaults to JOBS, except for Hotspot, where the default is number of CPU cores/2, but never more than memory size in GB/2.

TIMEOUT_FACTOR

-

The timeout factor (-timeoutFactor).

-

Defaults to 4.

+

The TIMEOUT_FACTOR is forwarded to JTReg framework +itself (-timeoutFactor). Also, some test cases that +programmatically wait a certain amount of time will apply this factor. +If we run in forced compilation mode (-Xcomp), the build +system will automatically adjust this factor to compensate for less +performance. Defaults to 1.

FAILURE_HANDLER_TIMEOUT

Sets the argument -timeoutHandlerTimeout for JTReg. The default value is 0. This is only valid if the failure handler is diff --git a/doc/testing.md b/doc/testing.md index 4cfc36c85f9..324f9645c27 100644 --- a/doc/testing.md +++ b/doc/testing.md @@ -324,7 +324,7 @@ Currently only applies to JTReg. #### TIMEOUT_FACTOR -Currently only applies to JTReg. +Currently only applies to [JTReg -timeoutFactor](#timeout_factor-1). #### JAVA_OPTIONS @@ -383,9 +383,11 @@ never more than *memory size in GB/2*. #### TIMEOUT_FACTOR -The timeout factor (`-timeoutFactor`). - -Defaults to 4. +The `TIMEOUT_FACTOR` is forwarded to JTReg framework itself +(`-timeoutFactor`). Also, some test cases that programmatically wait a +certain amount of time will apply this factor. If we run in forced +compilation mode (`-Xcomp`), the build system will automatically +adjust this factor to compensate for less performance. Defaults to 1. #### FAILURE_HANDLER_TIMEOUT diff --git a/make/RunTests.gmk b/make/RunTests.gmk index 46f9a2e4047..10f0a2f87ed 100644 --- a/make/RunTests.gmk +++ b/make/RunTests.gmk @@ -946,7 +946,8 @@ define SetupRunJtregTestBody JTREG_ALL_OPTIONS := $$(JTREG_JAVA_OPTIONS) $$(JTREG_VM_OPTIONS) JTREG_AUTO_PROBLEM_LISTS := - JTREG_AUTO_TIMEOUT_FACTOR := 4 + # Please reach consensus before changing this. It was not easy changing it to a `1`. + JTREG_AUTO_TIMEOUT_FACTOR := 1 ifneq ($$(findstring -Xcomp, $$(JTREG_ALL_OPTIONS)), ) JTREG_AUTO_PROBLEM_LISTS += ProblemList-Xcomp.txt diff --git a/test/hotspot/jtreg/compiler/arguments/TestCompileTaskTimeout.java b/test/hotspot/jtreg/compiler/arguments/TestCompileTaskTimeout.java index 4204f7be92e..cb52e5a24a0 100644 --- a/test/hotspot/jtreg/compiler/arguments/TestCompileTaskTimeout.java +++ b/test/hotspot/jtreg/compiler/arguments/TestCompileTaskTimeout.java @@ -29,7 +29,7 @@ package compiler.arguments; * @requires vm.debug & vm.flagless & os.name == "Linux" * @summary Check functionality of CompileTaskTimeout * @library /test/lib - * @run driver compiler.arguments.TestCompileTaskTimeout + * @run driver/timeout=480 compiler.arguments.TestCompileTaskTimeout */ import jdk.test.lib.process.ProcessTools; diff --git a/test/hotspot/jtreg/compiler/arraycopy/stress/TestStressArrayCopy.java b/test/hotspot/jtreg/compiler/arraycopy/stress/TestStressArrayCopy.java index 55dfb0460a2..8c410c77e5f 100644 --- a/test/hotspot/jtreg/compiler/arraycopy/stress/TestStressArrayCopy.java +++ b/test/hotspot/jtreg/compiler/arraycopy/stress/TestStressArrayCopy.java @@ -51,7 +51,7 @@ import jdk.test.whitebox.cpuinfo.CPUInfo; * jdk.test.whitebox.WhiteBox * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox * - * @run main/othervm/timeout=7200 + * @run main/othervm/timeout=28800 * -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI * compiler.arraycopy.stress.TestStressArrayCopy */ diff --git a/test/hotspot/jtreg/compiler/c1/TestConcurrentPatching.java b/test/hotspot/jtreg/compiler/c1/TestConcurrentPatching.java index 6a7179d0ce4..dfd719f3a3b 100644 --- a/test/hotspot/jtreg/compiler/c1/TestConcurrentPatching.java +++ b/test/hotspot/jtreg/compiler/c1/TestConcurrentPatching.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -30,7 +30,7 @@ import java.util.ArrayList; * @test * @bug 8340313 * @summary Test that concurrent patching of oop immediates is thread-safe in C1. - * @run main/othervm/timeout=480 -Xcomp -XX:CompileCommand=compileonly,TestConcurrentPatching::* -XX:TieredStopAtLevel=1 TestConcurrentPatching + * @run main/othervm/timeout=1920 -Xcomp -XX:CompileCommand=compileonly,TestConcurrentPatching::* -XX:TieredStopAtLevel=1 TestConcurrentPatching */ class MyClass { } diff --git a/test/hotspot/jtreg/compiler/c1/TestPinnedIntrinsics.java b/test/hotspot/jtreg/compiler/c1/TestPinnedIntrinsics.java index a1f42a43240..0c47f752eab 100644 --- a/test/hotspot/jtreg/compiler/c1/TestPinnedIntrinsics.java +++ b/test/hotspot/jtreg/compiler/c1/TestPinnedIntrinsics.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,7 +25,7 @@ * @test * @bug 8184271 * @summary Test correct scheduling of System.nanoTime C1 intrinsic. - * @run main/othervm -XX:TieredStopAtLevel=1 -Xbatch + * @run main/othervm/timeout=480 -XX:TieredStopAtLevel=1 -Xbatch * -XX:CompileCommand=dontinline,compiler.c1.TestPinnedIntrinsics::checkNanoTime * compiler.c1.TestPinnedIntrinsics */ diff --git a/test/hotspot/jtreg/compiler/c2/TestMergeStores.java b/test/hotspot/jtreg/compiler/c2/TestMergeStores.java index 22920eda828..84329c4a9c8 100644 --- a/test/hotspot/jtreg/compiler/c2/TestMergeStores.java +++ b/test/hotspot/jtreg/compiler/c2/TestMergeStores.java @@ -37,7 +37,7 @@ import java.util.Random; * @summary Test merging of consecutive stores * @modules java.base/jdk.internal.misc * @library /test/lib / - * @run main compiler.c2.TestMergeStores aligned + * @run main/timeout=480 compiler.c2.TestMergeStores aligned */ /* @@ -46,7 +46,7 @@ import java.util.Random; * @summary Test merging of consecutive stores * @modules java.base/jdk.internal.misc * @library /test/lib / - * @run main compiler.c2.TestMergeStores unaligned + * @run main/timeout=480 compiler.c2.TestMergeStores unaligned */ /* @@ -55,7 +55,7 @@ import java.util.Random; * @summary Test merging of consecutive stores * @modules java.base/jdk.internal.misc * @library /test/lib / - * @run main compiler.c2.TestMergeStores StressIGVN + * @run main/timeout=480 compiler.c2.TestMergeStores StressIGVN */ public class TestMergeStores { diff --git a/test/hotspot/jtreg/compiler/c2/TestScalarReplacementMaxLiveNodes.java b/test/hotspot/jtreg/compiler/c2/TestScalarReplacementMaxLiveNodes.java index 60086dba327..f133e91a1ee 100644 --- a/test/hotspot/jtreg/compiler/c2/TestScalarReplacementMaxLiveNodes.java +++ b/test/hotspot/jtreg/compiler/c2/TestScalarReplacementMaxLiveNodes.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -28,8 +28,8 @@ * @library /test/lib / * @requires vm.debug & vm.compiler2.enabled * @compile -XDstringConcat=inline TestScalarReplacementMaxLiveNodes.java - * @run main/othervm compiler.c2.TestScalarReplacementMaxLiveNodes - * @run main/othervm -Xbatch -XX:-OptimizeStringConcat -XX:-TieredCompilation + * @run main/othervm/timeout=480 compiler.c2.TestScalarReplacementMaxLiveNodes + * @run main/othervm/timeout=480 -Xbatch -XX:-OptimizeStringConcat -XX:-TieredCompilation * -XX:+UnlockDiagnosticVMOptions -XX:+ReduceAllocationMerges * -XX:CompileCommand=dontinline,compiler.c2.TestScalarReplacementMaxLiveNodes::test * -XX:CompileCommand=compileonly,*TestScalarReplacementMaxLiveNodes*::*test* diff --git a/test/hotspot/jtreg/compiler/c2/TestStressRecompilation.java b/test/hotspot/jtreg/compiler/c2/TestStressRecompilation.java index 923323beb75..3572b6137f0 100644 --- a/test/hotspot/jtreg/compiler/c2/TestStressRecompilation.java +++ b/test/hotspot/jtreg/compiler/c2/TestStressRecompilation.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ * @bug 8245801 * @requires vm.debug * @summary Test running with StressRecompilation enabled. - * @run main/othervm -Xcomp -XX:+IgnoreUnrecognizedVMOptions -XX:+StressRecompilation + * @run main/othervm/timeout=480 -Xcomp -XX:+IgnoreUnrecognizedVMOptions -XX:+StressRecompilation * compiler.c2.TestStressRecompilation */ diff --git a/test/hotspot/jtreg/compiler/classUnloading/methodUnloading/TestOverloadCompileQueues.java b/test/hotspot/jtreg/compiler/classUnloading/methodUnloading/TestOverloadCompileQueues.java index 04906954090..db5f31d8c77 100644 --- a/test/hotspot/jtreg/compiler/classUnloading/methodUnloading/TestOverloadCompileQueues.java +++ b/test/hotspot/jtreg/compiler/classUnloading/methodUnloading/TestOverloadCompileQueues.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,9 +26,9 @@ * @bug 8163511 8230402 * @summary Test overloading the C1 and C2 compile queues with tasks. * @requires !vm.graal.enabled - * @run main/othervm/timeout=300 -XX:-TieredCompilation -XX:CompileThreshold=2 -XX:CICompilerCount=1 + * @run main/othervm/timeout=1200 -XX:-TieredCompilation -XX:CompileThreshold=2 -XX:CICompilerCount=1 * compiler.classUnloading.methodUnloading.TestOverloadCompileQueues - * @run main/othervm/timeout=300 -XX:TieredCompileTaskTimeout=1000 -XX:CompileThresholdScaling=0.001 -XX:CICompilerCount=2 + * @run main/othervm/timeout=1200 -XX:TieredCompileTaskTimeout=1000 -XX:CompileThresholdScaling=0.001 -XX:CICompilerCount=2 * compiler.classUnloading.methodUnloading.TestOverloadCompileQueues */ diff --git a/test/hotspot/jtreg/compiler/codegen/TestAntiDependenciesHighMemUsage2.java b/test/hotspot/jtreg/compiler/codegen/TestAntiDependenciesHighMemUsage2.java index d5f220f4628..cfe884c269f 100644 --- a/test/hotspot/jtreg/compiler/codegen/TestAntiDependenciesHighMemUsage2.java +++ b/test/hotspot/jtreg/compiler/codegen/TestAntiDependenciesHighMemUsage2.java @@ -25,7 +25,7 @@ * @test * @bug 8333258 * @summary C2: high memory usage in PhaseCFG::raise_above_anti_dependences() - * @run main/othervm -XX:CompileOnly=TestAntiDependenciesHighMemUsage2::test1 -XX:-ClipInlining + * @run main/othervm/timeout=480 -XX:CompileOnly=TestAntiDependenciesHighMemUsage2::test1 -XX:-ClipInlining * -XX:-BackgroundCompilation -XX:-TieredCompilation -XX:-UseOnStackReplacement TestAntiDependenciesHighMemUsage2 */ diff --git a/test/hotspot/jtreg/compiler/codegen/aes/TestCipherBlockChainingEncrypt.java b/test/hotspot/jtreg/compiler/codegen/aes/TestCipherBlockChainingEncrypt.java index 46d09b42425..b80a4ecdf5c 100644 --- a/test/hotspot/jtreg/compiler/codegen/aes/TestCipherBlockChainingEncrypt.java +++ b/test/hotspot/jtreg/compiler/codegen/aes/TestCipherBlockChainingEncrypt.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -30,7 +30,7 @@ * @build jdk.test.whitebox.WhiteBox * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox * - * @run main/othervm -Xbatch + * @run main/othervm/timeout=480 -Xbatch * -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. * compiler.codegen.aes.TestCipherBlockChainingEncrypt */ diff --git a/test/hotspot/jtreg/compiler/controldependency/TestLoadBypassesClassCast.java b/test/hotspot/jtreg/compiler/controldependency/TestLoadBypassesClassCast.java index f5608c3a51a..127206f9b0e 100644 --- a/test/hotspot/jtreg/compiler/controldependency/TestLoadBypassesClassCast.java +++ b/test/hotspot/jtreg/compiler/controldependency/TestLoadBypassesClassCast.java @@ -26,7 +26,7 @@ * @summary C2: Load can bypass subtype check that enforces it's from the right object type * @requires vm.gc.Parallel * @requires vm.compiler2.enabled - * @run main/othervm -XX:-TieredCompilation -XX:-BackgroundCompilation -XX:-UseOnStackReplacement -XX:CompileOnly=TestLoadBypassesClassCast::test + * @run main/othervm/timeout=480 -XX:-TieredCompilation -XX:-BackgroundCompilation -XX:-UseOnStackReplacement -XX:CompileOnly=TestLoadBypassesClassCast::test * -XX:CompileThreshold=20000 -XX:LoopMaxUnroll=1 -XX:-LoopUnswitching -XX:+UseParallelGC TestLoadBypassesClassCast * */ diff --git a/test/hotspot/jtreg/compiler/floatingpoint/TestFloatSyncJNIArgs.java b/test/hotspot/jtreg/compiler/floatingpoint/TestFloatSyncJNIArgs.java index d9699062952..cd596c337b7 100644 --- a/test/hotspot/jtreg/compiler/floatingpoint/TestFloatSyncJNIArgs.java +++ b/test/hotspot/jtreg/compiler/floatingpoint/TestFloatSyncJNIArgs.java @@ -27,7 +27,7 @@ * @summary Regression test for passing float args to a synchronized jni function. * * - * @run main/othervm/native compiler.floatingpoint.TestFloatSyncJNIArgs + * @run main/othervm/native/timeout=480 compiler.floatingpoint.TestFloatSyncJNIArgs */ package compiler.floatingpoint; diff --git a/test/hotspot/jtreg/compiler/intrinsics/TestLongUnsignedDivMod.java b/test/hotspot/jtreg/compiler/intrinsics/TestLongUnsignedDivMod.java index 88fd46c4325..ce9444823da 100644 --- a/test/hotspot/jtreg/compiler/intrinsics/TestLongUnsignedDivMod.java +++ b/test/hotspot/jtreg/compiler/intrinsics/TestLongUnsignedDivMod.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ * @summary Test intrinsic for divideUnsigned() and remainderUnsigned() methods for Long * @requires os.arch=="amd64" | os.arch=="x86_64" | os.arch=="riscv64" | os.arch=="aarch64" * @library /test/lib / -* @run driver compiler.intrinsics.TestLongUnsignedDivMod +* @run driver/timeout=480 compiler.intrinsics.TestLongUnsignedDivMod */ package compiler.intrinsics; diff --git a/test/hotspot/jtreg/compiler/jsr292/ContinuousCallSiteTargetChange.java b/test/hotspot/jtreg/compiler/jsr292/ContinuousCallSiteTargetChange.java index 2b501064b76..5964341e816 100644 --- a/test/hotspot/jtreg/compiler/jsr292/ContinuousCallSiteTargetChange.java +++ b/test/hotspot/jtreg/compiler/jsr292/ContinuousCallSiteTargetChange.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -28,7 +28,7 @@ * * @build jdk.test.whitebox.WhiteBox * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox - * @run driver/timeout=180 compiler.jsr292.ContinuousCallSiteTargetChange + * @run driver/timeout=720 compiler.jsr292.ContinuousCallSiteTargetChange */ package compiler.jsr292; diff --git a/test/hotspot/jtreg/compiler/jsr292/RedefineMethodUsedByMultipleMethodHandles.java b/test/hotspot/jtreg/compiler/jsr292/RedefineMethodUsedByMultipleMethodHandles.java index 93f21164bf5..769863880f2 100644 --- a/test/hotspot/jtreg/compiler/jsr292/RedefineMethodUsedByMultipleMethodHandles.java +++ b/test/hotspot/jtreg/compiler/jsr292/RedefineMethodUsedByMultipleMethodHandles.java @@ -32,7 +32,7 @@ * jdk.attach * @requires vm.jvmti * - * @run main/othervm -Djdk.attach.allowAttachSelf compiler.jsr292.RedefineMethodUsedByMultipleMethodHandles + * @run main/othervm/timeout=480 -Djdk.attach.allowAttachSelf compiler.jsr292.RedefineMethodUsedByMultipleMethodHandles */ package compiler.jsr292; diff --git a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/RedefineClassTest.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/RedefineClassTest.java index 6aeaf4eec7e..a6f58fd1375 100644 --- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/RedefineClassTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/RedefineClassTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -30,7 +30,7 @@ * jdk.internal.vm.ci/jdk.vm.ci.runtime * jdk.attach * java.base/jdk.internal.misc - * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:-UseJVMCICompiler -Djdk.attach.allowAttachSelf jdk.vm.ci.runtime.test.RedefineClassTest + * @run junit/othervm/timeout=480 -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:-UseJVMCICompiler -Djdk.attach.allowAttachSelf jdk.vm.ci.runtime.test.RedefineClassTest */ package jdk.vm.ci.runtime.test; diff --git a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaMethod.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaMethod.java index 6151ae68ce7..58612aa0da1 100644 --- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaMethod.java +++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaMethod.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -40,7 +40,7 @@ * java.base/jdk.internal.misc * java.base/jdk.internal.vm * java.base/sun.reflect.annotation - * @run junit/othervm/timeout=240 -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:-UseJVMCICompiler jdk.vm.ci.runtime.test.TestResolvedJavaMethod + * @run junit/othervm/timeout=960 -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:-UseJVMCICompiler jdk.vm.ci.runtime.test.TestResolvedJavaMethod */ package jdk.vm.ci.runtime.test; diff --git a/test/hotspot/jtreg/compiler/loopopts/TestMaxLoopOptsCountReached.java b/test/hotspot/jtreg/compiler/loopopts/TestMaxLoopOptsCountReached.java index d8a56e1b51b..a529c69dae8 100644 --- a/test/hotspot/jtreg/compiler/loopopts/TestMaxLoopOptsCountReached.java +++ b/test/hotspot/jtreg/compiler/loopopts/TestMaxLoopOptsCountReached.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ * @bug 8284944 * @requires vm.compiler2.enabled * @summary triggers the loop optimization phase `LoopOptsCount` many times - * @run main/othervm -Xcomp -XX:-PartialPeelLoop -XX:CompileCommand=compileonly,TestMaxLoopOptsCountReached::test TestMaxLoopOptsCountReached + * @run main/othervm/timeout=480 -Xcomp -XX:-PartialPeelLoop -XX:CompileCommand=compileonly,TestMaxLoopOptsCountReached::test TestMaxLoopOptsCountReached */ import java.lang.System.Logger.Level; diff --git a/test/hotspot/jtreg/compiler/loopopts/TestPartialPeelAtUnsignedTestsNegativeLimit.java b/test/hotspot/jtreg/compiler/loopopts/TestPartialPeelAtUnsignedTestsNegativeLimit.java index 7809f79ce9d..34f0411f4ed 100644 --- a/test/hotspot/jtreg/compiler/loopopts/TestPartialPeelAtUnsignedTestsNegativeLimit.java +++ b/test/hotspot/jtreg/compiler/loopopts/TestPartialPeelAtUnsignedTestsNegativeLimit.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,7 +25,7 @@ * @test id=Xbatch * @bug 8332920 * @summary Tests partial peeling at unsigned tests with limit being negative in exit tests "i >u limit". - * @run main/othervm -Xbatch -XX:-TieredCompilation + * @run main/othervm/timeout=480 -Xbatch -XX:-TieredCompilation * -XX:CompileOnly=*TestPartialPeel*::original*,*TestPartialPeel*::test* * compiler.loopopts.TestPartialPeelAtUnsignedTestsNegativeLimit */ @@ -34,7 +34,7 @@ * @test id=Xcomp-run-inline * @bug 8332920 * @summary Tests partial peeling at unsigned tests with limit being negative in exit tests "i >u limit". - * @run main/othervm -Xcomp -XX:-TieredCompilation + * @run main/othervm/timeout=480 -Xcomp -XX:-TieredCompilation * -XX:CompileOnly=*TestPartialPeel*::original*,*TestPartialPeel*::run*,*TestPartialPeel*::test* * -XX:CompileCommand=inline,*TestPartialPeelAtUnsignedTestsNegativeLimit::test* * -XX:CompileCommand=dontinline,*TestPartialPeelAtUnsignedTestsNegativeLimit::check @@ -45,7 +45,7 @@ * @test id=Xcomp-compile-test * @bug 8332920 * @summary Tests partial peeling at unsigned tests with limit being negative in exit tests "i >u limit". - * @run main/othervm -Xcomp -XX:-TieredCompilation -XX:CompileOnly=*TestPartialPeel*::original*,*TestPartialPeel*::test* + * @run main/othervm/timeout=480 -Xcomp -XX:-TieredCompilation -XX:CompileOnly=*TestPartialPeel*::original*,*TestPartialPeel*::test* * compiler.loopopts.TestPartialPeelAtUnsignedTestsNegativeLimit */ @@ -55,7 +55,7 @@ * @requires vm.flavor == "server" & (vm.opt.TieredStopAtLevel == null | vm.opt.TieredStopAtLevel == 4) * @summary Tests partial peeling at unsigned tests with limit being negative in exit tests "i >u limit". * Only run this test with C2 since it is time-consuming and only tests a C2 issue. - * @run main compiler.loopopts.TestPartialPeelAtUnsignedTestsNegativeLimit + * @run main/timeout=480 compiler.loopopts.TestPartialPeelAtUnsignedTestsNegativeLimit */ package compiler.loopopts; diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Double.java b/test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Double.java index 41284c0d61e..4eebe6a80fe 100644 --- a/test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Double.java +++ b/test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Double.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ * @bug 8074981 * @summary Add C2 x86 Superword support for scalar product reduction optimizations : float test * @library /test/lib / - * @run driver compiler.loopopts.superword.ProdRed_Double + * @run driver/timeout=480 compiler.loopopts.superword.ProdRed_Double */ package compiler.loopopts.superword; diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Float.java b/test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Float.java index 603530f7fb2..116a69f6bbf 100644 --- a/test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Float.java +++ b/test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Float.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ * @bug 8074981 * @summary Add C2 x86 Superword support for scalar product reduction optimizations : float test * @library /test/lib / - * @run driver compiler.loopopts.superword.ProdRed_Float + * @run driver/timeout=480 compiler.loopopts.superword.ProdRed_Float */ package compiler.loopopts.superword; diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Int.java b/test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Int.java index 9ca670117cf..433a4b6f3a3 100644 --- a/test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Int.java +++ b/test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Int.java @@ -26,7 +26,7 @@ * @bug 8074981 * @summary Add C2 x86 Superword support for scalar product reduction optimizations : int test * @library /test/lib / - * @run driver compiler.loopopts.superword.ProdRed_Int + * @run driver/timeout=480 compiler.loopopts.superword.ProdRed_Int */ package compiler.loopopts.superword; diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/SumRedAbsNeg_Double.java b/test/hotspot/jtreg/compiler/loopopts/superword/SumRedAbsNeg_Double.java index 0122f1c34cd..2dd720ad1f0 100644 --- a/test/hotspot/jtreg/compiler/loopopts/superword/SumRedAbsNeg_Double.java +++ b/test/hotspot/jtreg/compiler/loopopts/superword/SumRedAbsNeg_Double.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ * @bug 8138583 * @summary Add C2 AArch64 Superword support for scalar sum reduction optimizations : double abs & neg test * @library /test/lib / - * @run driver compiler.loopopts.superword.SumRedAbsNeg_Double + * @run driver/timeout=480 compiler.loopopts.superword.SumRedAbsNeg_Double */ package compiler.loopopts.superword; diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/SumRedAbsNeg_Float.java b/test/hotspot/jtreg/compiler/loopopts/superword/SumRedAbsNeg_Float.java index 6e2d304c149..3ada72c402b 100644 --- a/test/hotspot/jtreg/compiler/loopopts/superword/SumRedAbsNeg_Float.java +++ b/test/hotspot/jtreg/compiler/loopopts/superword/SumRedAbsNeg_Float.java @@ -26,7 +26,7 @@ * @bug 8138583 * @summary Add C2 AArch64 Superword support for scalar sum reduction optimizations : float abs & neg test * @library /test/lib / - * @run driver compiler.loopopts.superword.SumRedAbsNeg_Float + * @run driver/timeout=480 compiler.loopopts.superword.SumRedAbsNeg_Float */ package compiler.loopopts.superword; diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/SumRedSqrt_Double.java b/test/hotspot/jtreg/compiler/loopopts/superword/SumRedSqrt_Double.java index 2965af2a63b..ab99fd4adef 100644 --- a/test/hotspot/jtreg/compiler/loopopts/superword/SumRedSqrt_Double.java +++ b/test/hotspot/jtreg/compiler/loopopts/superword/SumRedSqrt_Double.java @@ -26,7 +26,7 @@ * @bug 8135028 * @summary Add C2 x86 Superword support for scalar sum reduction optimizations : double sqrt test * @library /test/lib / - * @run driver compiler.loopopts.superword.SumRedSqrt_Double + * @run driver/timeout=480 compiler.loopopts.superword.SumRedSqrt_Double */ diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/SumRed_Double.java b/test/hotspot/jtreg/compiler/loopopts/superword/SumRed_Double.java index 0b81ae59bf0..89a396f43af 100644 --- a/test/hotspot/jtreg/compiler/loopopts/superword/SumRed_Double.java +++ b/test/hotspot/jtreg/compiler/loopopts/superword/SumRed_Double.java @@ -26,7 +26,7 @@ * @bug 8074981 * @summary Add C2 x86 Superword support for scalar sum reduction optimizations : double test * @library /test/lib / - * @run driver compiler.loopopts.superword.SumRed_Double + * @run driver/timeout=480 compiler.loopopts.superword.SumRed_Double */ package compiler.loopopts.superword; diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/SumRed_Float.java b/test/hotspot/jtreg/compiler/loopopts/superword/SumRed_Float.java index f667f2d05c1..db3ccf1a0b2 100644 --- a/test/hotspot/jtreg/compiler/loopopts/superword/SumRed_Float.java +++ b/test/hotspot/jtreg/compiler/loopopts/superword/SumRed_Float.java @@ -26,7 +26,7 @@ * @bug 8074981 * @summary Add C2 x86 Superword support for scalar sum reduction optimizations : float test * @library /test/lib / - * @run driver compiler.loopopts.superword.SumRed_Float + * @run driver/timeout=480 compiler.loopopts.superword.SumRed_Float */ package compiler.loopopts.superword; diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/SumRed_Int.java b/test/hotspot/jtreg/compiler/loopopts/superword/SumRed_Int.java index 098dc2a7d1e..8c7e69247c5 100644 --- a/test/hotspot/jtreg/compiler/loopopts/superword/SumRed_Int.java +++ b/test/hotspot/jtreg/compiler/loopopts/superword/SumRed_Int.java @@ -26,7 +26,7 @@ * @bug 8074981 * @summary Add C2 x86 Superword support for scalar sum reduction optimizations : int test * @library /test/lib / - * @run driver compiler.loopopts.superword.SumRed_Int + * @run driver/timeout=480 compiler.loopopts.superword.SumRed_Int */ package compiler.loopopts.superword; diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestDependencyOffsets.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestDependencyOffsets.java index d760c87ad19..e2aca036474 100644 --- a/test/hotspot/jtreg/compiler/loopopts/superword/TestDependencyOffsets.java +++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestDependencyOffsets.java @@ -27,7 +27,7 @@ * @summary Test SuperWord: vector size, offsets, dependencies, alignment. * @library /test/lib / * @compile ../../lib/ir_framework/TestFramework.java - * @run driver compiler.loopopts.superword.TestDependencyOffsets vanilla-A + * @run driver/timeout=480 compiler.loopopts.superword.TestDependencyOffsets vanilla-A */ /* @@ -36,7 +36,7 @@ * @summary Test SuperWord: vector size, offsets, dependencies, alignment. * @library /test/lib / * @compile ../../lib/ir_framework/TestFramework.java - * @run driver compiler.loopopts.superword.TestDependencyOffsets vanilla-U + * @run driver/timeout=480 compiler.loopopts.superword.TestDependencyOffsets vanilla-U */ /* @@ -48,7 +48,7 @@ * @requires vm.cpu.features ~= ".*sse4.*" * @library /test/lib / * @compile ../../lib/ir_framework/TestFramework.java - * @run driver compiler.loopopts.superword.TestDependencyOffsets sse4-v016-A + * @run driver/timeout=480 compiler.loopopts.superword.TestDependencyOffsets sse4-v016-A */ /* @@ -60,7 +60,7 @@ * @requires vm.cpu.features ~= ".*sse4.*" * @library /test/lib / * @compile ../../lib/ir_framework/TestFramework.java - * @run driver compiler.loopopts.superword.TestDependencyOffsets sse4-v016-U + * @run driver/timeout=480 compiler.loopopts.superword.TestDependencyOffsets sse4-v016-U */ /* @@ -72,7 +72,7 @@ * @requires vm.cpu.features ~= ".*sse4.*" * @library /test/lib / * @compile ../../lib/ir_framework/TestFramework.java - * @run driver compiler.loopopts.superword.TestDependencyOffsets sse4-v008-A + * @run driver/timeout=480 compiler.loopopts.superword.TestDependencyOffsets sse4-v008-A */ /* @@ -84,7 +84,7 @@ * @requires vm.cpu.features ~= ".*sse4.*" * @library /test/lib / * @compile ../../lib/ir_framework/TestFramework.java - * @run driver compiler.loopopts.superword.TestDependencyOffsets sse4-v008-U + * @run driver/timeout=480 compiler.loopopts.superword.TestDependencyOffsets sse4-v008-U */ /* @@ -96,7 +96,7 @@ * @requires vm.cpu.features ~= ".*sse4.*" * @library /test/lib / * @compile ../../lib/ir_framework/TestFramework.java - * @run driver compiler.loopopts.superword.TestDependencyOffsets sse4-v004-A + * @run driver/timeout=480 compiler.loopopts.superword.TestDependencyOffsets sse4-v004-A */ /* @@ -108,7 +108,7 @@ * @requires vm.cpu.features ~= ".*sse4.*" * @library /test/lib / * @compile ../../lib/ir_framework/TestFramework.java - * @run driver compiler.loopopts.superword.TestDependencyOffsets sse4-v004-U + * @run driver/timeout=480 compiler.loopopts.superword.TestDependencyOffsets sse4-v004-U */ /* @@ -120,7 +120,7 @@ * @requires vm.cpu.features ~= ".*avx.*" * @library /test/lib / * @compile ../../lib/ir_framework/TestFramework.java - * @run driver compiler.loopopts.superword.TestDependencyOffsets avx1-v032-A + * @run driver/timeout=480 compiler.loopopts.superword.TestDependencyOffsets avx1-v032-A */ /* @@ -132,7 +132,7 @@ * @requires vm.cpu.features ~= ".*avx.*" * @library /test/lib / * @compile ../../lib/ir_framework/TestFramework.java - * @run driver compiler.loopopts.superword.TestDependencyOffsets avx1-v032-U + * @run driver/timeout=480 compiler.loopopts.superword.TestDependencyOffsets avx1-v032-U */ /* @@ -144,7 +144,7 @@ * @requires vm.cpu.features ~= ".*avx.*" * @library /test/lib / * @compile ../../lib/ir_framework/TestFramework.java - * @run driver compiler.loopopts.superword.TestDependencyOffsets avx1-v016-A + * @run driver/timeout=480 compiler.loopopts.superword.TestDependencyOffsets avx1-v016-A */ /* @@ -156,7 +156,7 @@ * @requires vm.cpu.features ~= ".*avx.*" * @library /test/lib / * @compile ../../lib/ir_framework/TestFramework.java - * @run driver compiler.loopopts.superword.TestDependencyOffsets avx1-v016-U + * @run driver/timeout=480 compiler.loopopts.superword.TestDependencyOffsets avx1-v016-U */ /* @@ -168,7 +168,7 @@ * @requires vm.cpu.features ~= ".*avx2.*" * @library /test/lib / * @compile ../../lib/ir_framework/TestFramework.java - * @run driver compiler.loopopts.superword.TestDependencyOffsets avx2-v032-A + * @run driver/timeout=480 compiler.loopopts.superword.TestDependencyOffsets avx2-v032-A */ /* @@ -180,7 +180,7 @@ * @requires vm.cpu.features ~= ".*avx2.*" * @library /test/lib / * @compile ../../lib/ir_framework/TestFramework.java - * @run driver compiler.loopopts.superword.TestDependencyOffsets avx2-v032-U + * @run driver/timeout=480 compiler.loopopts.superword.TestDependencyOffsets avx2-v032-U */ /* @@ -192,7 +192,7 @@ * @requires vm.cpu.features ~= ".*avx2.*" * @library /test/lib / * @compile ../../lib/ir_framework/TestFramework.java - * @run driver compiler.loopopts.superword.TestDependencyOffsets avx2-v016-A + * @run driver/timeout=480 compiler.loopopts.superword.TestDependencyOffsets avx2-v016-A */ /* @@ -204,7 +204,7 @@ * @requires vm.cpu.features ~= ".*avx2.*" * @library /test/lib / * @compile ../../lib/ir_framework/TestFramework.java - * @run driver compiler.loopopts.superword.TestDependencyOffsets avx2-v016-U + * @run driver/timeout=480 compiler.loopopts.superword.TestDependencyOffsets avx2-v016-U */ /* @@ -216,7 +216,7 @@ * @requires vm.cpu.features ~= ".*avx512.*" * @library /test/lib / * @compile ../../lib/ir_framework/TestFramework.java - * @run driver compiler.loopopts.superword.TestDependencyOffsets avx512-v064-A + * @run driver/timeout=480 compiler.loopopts.superword.TestDependencyOffsets avx512-v064-A */ /* @@ -228,7 +228,7 @@ * @requires vm.cpu.features ~= ".*avx512.*" * @library /test/lib / * @compile ../../lib/ir_framework/TestFramework.java - * @run driver compiler.loopopts.superword.TestDependencyOffsets avx512-v064-U + * @run driver/timeout=480 compiler.loopopts.superword.TestDependencyOffsets avx512-v064-U */ /* @@ -240,7 +240,7 @@ * @requires vm.cpu.features ~= ".*avx512.*" * @library /test/lib / * @compile ../../lib/ir_framework/TestFramework.java - * @run driver compiler.loopopts.superword.TestDependencyOffsets avx512-v032-A + * @run driver/timeout=480 compiler.loopopts.superword.TestDependencyOffsets avx512-v032-A */ /* @@ -252,7 +252,7 @@ * @requires vm.cpu.features ~= ".*avx512.*" * @library /test/lib / * @compile ../../lib/ir_framework/TestFramework.java - * @run driver compiler.loopopts.superword.TestDependencyOffsets avx512-v032-U + * @run driver/timeout=480 compiler.loopopts.superword.TestDependencyOffsets avx512-v032-U */ /* @@ -264,7 +264,7 @@ * @requires vm.cpu.features ~= ".*avx512bw.*" * @library /test/lib / * @compile ../../lib/ir_framework/TestFramework.java - * @run driver compiler.loopopts.superword.TestDependencyOffsets avx512bw-v064-A + * @run driver/timeout=480 compiler.loopopts.superword.TestDependencyOffsets avx512bw-v064-A */ /* @@ -276,7 +276,7 @@ * @requires vm.cpu.features ~= ".*avx512bw.*" * @library /test/lib / * @compile ../../lib/ir_framework/TestFramework.java - * @run driver compiler.loopopts.superword.TestDependencyOffsets avx512bw-v064-U + * @run driver/timeout=480 compiler.loopopts.superword.TestDependencyOffsets avx512bw-v064-U */ /* @@ -288,7 +288,7 @@ * @requires vm.cpu.features ~= ".*avx512bw.*" * @library /test/lib / * @compile ../../lib/ir_framework/TestFramework.java - * @run driver compiler.loopopts.superword.TestDependencyOffsets avx512bw-v032-A + * @run driver/timeout=480 compiler.loopopts.superword.TestDependencyOffsets avx512bw-v032-A */ /* @@ -300,7 +300,7 @@ * @requires vm.cpu.features ~= ".*avx512bw.*" * @library /test/lib / * @compile ../../lib/ir_framework/TestFramework.java - * @run driver compiler.loopopts.superword.TestDependencyOffsets avx512bw-v032-U + * @run driver/timeout=480 compiler.loopopts.superword.TestDependencyOffsets avx512bw-v032-U */ /* @@ -311,7 +311,7 @@ * @requires (os.arch!="x86" & os.arch!="i386" & os.arch!="amd64" & os.arch!="x86_64") * @library /test/lib / * @compile ../../lib/ir_framework/TestFramework.java - * @run driver compiler.loopopts.superword.TestDependencyOffsets vec-v064-A + * @run driver/timeout=480 compiler.loopopts.superword.TestDependencyOffsets vec-v064-A */ /* @@ -322,7 +322,7 @@ * @requires (os.arch!="x86" & os.arch!="i386" & os.arch!="amd64" & os.arch!="x86_64") * @library /test/lib / * @compile ../../lib/ir_framework/TestFramework.java - * @run driver compiler.loopopts.superword.TestDependencyOffsets vec-v064-U + * @run driver/timeout=480 compiler.loopopts.superword.TestDependencyOffsets vec-v064-U */ /* @@ -333,7 +333,7 @@ * @requires (os.arch!="x86" & os.arch!="i386" & os.arch!="amd64" & os.arch!="x86_64") * @library /test/lib / * @compile ../../lib/ir_framework/TestFramework.java - * @run driver compiler.loopopts.superword.TestDependencyOffsets vec-v032-A + * @run driver/timeout=480 compiler.loopopts.superword.TestDependencyOffsets vec-v032-A */ /* @@ -344,7 +344,7 @@ * @requires (os.arch!="x86" & os.arch!="i386" & os.arch!="amd64" & os.arch!="x86_64") * @library /test/lib / * @compile ../../lib/ir_framework/TestFramework.java - * @run driver compiler.loopopts.superword.TestDependencyOffsets vec-v032-U + * @run driver/timeout=480 compiler.loopopts.superword.TestDependencyOffsets vec-v032-U */ /* @@ -355,7 +355,7 @@ * @requires (os.arch!="x86" & os.arch!="i386" & os.arch!="amd64" & os.arch!="x86_64") * @library /test/lib / * @compile ../../lib/ir_framework/TestFramework.java - * @run driver compiler.loopopts.superword.TestDependencyOffsets vec-v016-A + * @run driver/timeout=480 compiler.loopopts.superword.TestDependencyOffsets vec-v016-A */ /* @@ -366,7 +366,7 @@ * @requires (os.arch!="x86" & os.arch!="i386" & os.arch!="amd64" & os.arch!="x86_64") * @library /test/lib / * @compile ../../lib/ir_framework/TestFramework.java - * @run driver compiler.loopopts.superword.TestDependencyOffsets vec-v016-U + * @run driver/timeout=480 compiler.loopopts.superword.TestDependencyOffsets vec-v016-U */ /* @@ -377,7 +377,7 @@ * @requires (os.arch!="x86" & os.arch!="i386" & os.arch!="amd64" & os.arch!="x86_64") * @library /test/lib / * @compile ../../lib/ir_framework/TestFramework.java - * @run driver compiler.loopopts.superword.TestDependencyOffsets vec-v008-A + * @run driver/timeout=480 compiler.loopopts.superword.TestDependencyOffsets vec-v008-A */ /* @@ -388,7 +388,7 @@ * @requires (os.arch!="x86" & os.arch!="i386" & os.arch!="amd64" & os.arch!="x86_64") * @library /test/lib / * @compile ../../lib/ir_framework/TestFramework.java - * @run driver compiler.loopopts.superword.TestDependencyOffsets vec-v008-U + * @run driver/timeout=480 compiler.loopopts.superword.TestDependencyOffsets vec-v008-U */ /* @@ -399,7 +399,7 @@ * @requires (os.arch!="x86" & os.arch!="i386" & os.arch!="amd64" & os.arch!="x86_64") * @library /test/lib / * @compile ../../lib/ir_framework/TestFramework.java - * @run driver compiler.loopopts.superword.TestDependencyOffsets vec-v004-A + * @run driver/timeout=480 compiler.loopopts.superword.TestDependencyOffsets vec-v004-A */ /* @@ -410,7 +410,7 @@ * @requires (os.arch!="x86" & os.arch!="i386" & os.arch!="amd64" & os.arch!="x86_64") * @library /test/lib / * @compile ../../lib/ir_framework/TestFramework.java - * @run driver compiler.loopopts.superword.TestDependencyOffsets vec-v004-U + * @run driver/timeout=480 compiler.loopopts.superword.TestDependencyOffsets vec-v004-U */ package compiler.loopopts.superword; diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestEquivalentInvariants.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestEquivalentInvariants.java index 7cec26d6532..91d1ee9666a 100644 --- a/test/hotspot/jtreg/compiler/loopopts/superword/TestEquivalentInvariants.java +++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestEquivalentInvariants.java @@ -39,7 +39,7 @@ import java.lang.foreign.*; * i.e. where the invariants have the same summands, but in a different order. * @modules java.base/jdk.internal.misc * @library /test/lib / - * @run driver/timeout=1200 compiler.loopopts.superword.TestEquivalentInvariants + * @run driver/timeout=4800 compiler.loopopts.superword.TestEquivalentInvariants */ public class TestEquivalentInvariants { diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestMovingLoadBeforeStore.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestMovingLoadBeforeStore.java index 72ca2cee341..18fb0019fa5 100644 --- a/test/hotspot/jtreg/compiler/loopopts/superword/TestMovingLoadBeforeStore.java +++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestMovingLoadBeforeStore.java @@ -29,12 +29,13 @@ * @key randomness * @modules java.base/jdk.internal.misc * @library /test/lib - * @run main/othervm -XX:CompileCommand=compileonly,compiler.loopopts.superword.TestMovingLoadBeforeStore::test* - * --add-modules java.base --add-exports java.base/jdk.internal.misc=ALL-UNNAMED - * -Xbatch - * -XX:+UnlockDiagnosticVMOptions -XX:+StressLCM - * -XX:+IgnoreUnrecognizedVMOptions -XX:LoopUnrollLimit=100 - * compiler.loopopts.superword.TestMovingLoadBeforeStore + * @run main/othervm/timeout=480 + * -XX:CompileCommand=compileonly,compiler.loopopts.superword.TestMovingLoadBeforeStore::test* + * --add-modules java.base --add-exports java.base/jdk.internal.misc=ALL-UNNAMED + * -Xbatch + * -XX:+UnlockDiagnosticVMOptions -XX:+StressLCM + * -XX:+IgnoreUnrecognizedVMOptions -XX:LoopUnrollLimit=100 + * compiler.loopopts.superword.TestMovingLoadBeforeStore */ package compiler.loopopts.superword; diff --git a/test/hotspot/jtreg/compiler/loopstripmining/CheckLoopStripMining.java b/test/hotspot/jtreg/compiler/loopstripmining/CheckLoopStripMining.java index 9e8ac6b013a..cdbf5affd01 100644 --- a/test/hotspot/jtreg/compiler/loopstripmining/CheckLoopStripMining.java +++ b/test/hotspot/jtreg/compiler/loopstripmining/CheckLoopStripMining.java @@ -28,7 +28,7 @@ * @requires vm.compiler2.enabled * * @library /test/lib - * @run driver compiler.loopstripmining.CheckLoopStripMining + * @run driver/timeout=480 compiler.loopstripmining.CheckLoopStripMining */ package compiler.loopstripmining; diff --git a/test/hotspot/jtreg/compiler/profiling/TestProfileCounterOverflow.java b/test/hotspot/jtreg/compiler/profiling/TestProfileCounterOverflow.java index b4c4d2d4a4a..bcd48698d13 100644 --- a/test/hotspot/jtreg/compiler/profiling/TestProfileCounterOverflow.java +++ b/test/hotspot/jtreg/compiler/profiling/TestProfileCounterOverflow.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2019, Loongson Technology Co. Ltd. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -27,7 +27,7 @@ * @bug 8224162 * @summary Profile counter for a call site may overflow. * @requires vm.compMode != "Xcomp" - * @run main/othervm -Xbatch -XX:-UseOnStackReplacement -XX:+IgnoreUnrecognizedVMOptions -XX:MaxTrivialSize=0 -XX:C1MaxTrivialSize=0 compiler.profiling.TestProfileCounterOverflow + * @run main/othervm/timeout=480 -Xbatch -XX:-UseOnStackReplacement -XX:+IgnoreUnrecognizedVMOptions -XX:MaxTrivialSize=0 -XX:C1MaxTrivialSize=0 compiler.profiling.TestProfileCounterOverflow */ package compiler.profiling; diff --git a/test/hotspot/jtreg/compiler/profiling/spectrapredefineclass/Launcher.java b/test/hotspot/jtreg/compiler/profiling/spectrapredefineclass/Launcher.java index bdf4b3fb852..297c0312069 100644 --- a/test/hotspot/jtreg/compiler/profiling/spectrapredefineclass/Launcher.java +++ b/test/hotspot/jtreg/compiler/profiling/spectrapredefineclass/Launcher.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -32,10 +32,10 @@ * @build compiler.profiling.spectrapredefineclass.Agent * @run driver jdk.test.lib.helpers.ClassFileInstaller compiler.profiling.spectrapredefineclass.Agent * @run driver compiler.profiling.spectrapredefineclass.Launcher - * @run main/othervm -XX:CompilationMode=high-only -XX:-BackgroundCompilation -XX:CompileThreshold=10000 - * -XX:-UseOnStackReplacement -XX:TypeProfileLevel=222 - * -XX:ReservedCodeCacheSize=3M -Djdk.attach.allowAttachSelf - * compiler.profiling.spectrapredefineclass.Agent + * @run main/othervm/timeout=480 -XX:CompilationMode=high-only -XX:-BackgroundCompilation -XX:CompileThreshold=10000 + * -XX:-UseOnStackReplacement -XX:TypeProfileLevel=222 + * -XX:ReservedCodeCacheSize=3M -Djdk.attach.allowAttachSelf + * compiler.profiling.spectrapredefineclass.Agent */ package compiler.profiling.spectrapredefineclass; diff --git a/test/hotspot/jtreg/compiler/profiling/spectrapredefineclass_classloaders/Launcher.java b/test/hotspot/jtreg/compiler/profiling/spectrapredefineclass_classloaders/Launcher.java index 6fdbca00523..e7f5736889c 100644 --- a/test/hotspot/jtreg/compiler/profiling/spectrapredefineclass_classloaders/Launcher.java +++ b/test/hotspot/jtreg/compiler/profiling/spectrapredefineclass_classloaders/Launcher.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -35,10 +35,10 @@ * compiler.profiling.spectrapredefineclass_classloaders.B * @run driver jdk.test.lib.helpers.ClassFileInstaller compiler.profiling.spectrapredefineclass_classloaders.Agent * @run driver compiler.profiling.spectrapredefineclass_classloaders.Launcher - * @run main/othervm -XX:CompilationMode=high-only -XX:-BackgroundCompilation -XX:CompileThreshold=10000 - * -XX:-UseOnStackReplacement -XX:TypeProfileLevel=222 - * -XX:ReservedCodeCacheSize=3M -Djdk.attach.allowAttachSelf - * compiler.profiling.spectrapredefineclass_classloaders.Agent + * @run main/othervm/timeout=480 -XX:CompilationMode=high-only -XX:-BackgroundCompilation -XX:CompileThreshold=10000 + * -XX:-UseOnStackReplacement -XX:TypeProfileLevel=222 + * -XX:ReservedCodeCacheSize=3M -Djdk.attach.allowAttachSelf + * compiler.profiling.spectrapredefineclass_classloaders.Agent */ package compiler.profiling.spectrapredefineclass_classloaders; diff --git a/test/hotspot/jtreg/compiler/tiered/Level2RecompilationTest.java b/test/hotspot/jtreg/compiler/tiered/Level2RecompilationTest.java index 9cdba8c7bea..5bf031b7c4a 100644 --- a/test/hotspot/jtreg/compiler/tiered/Level2RecompilationTest.java +++ b/test/hotspot/jtreg/compiler/tiered/Level2RecompilationTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -33,7 +33,7 @@ * * @build jdk.test.whitebox.WhiteBox * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox - * @run main/othervm -Xbootclasspath/a:. -XX:+TieredCompilation + * @run main/othervm/timeout=960 -Xbootclasspath/a:. -XX:+TieredCompilation * -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI * -XX:CompileCommand=compileonly,compiler.whitebox.SimpleTestCaseHelper::* * -XX:CompileCommand=print,compiler.whitebox.SimpleTestCaseHelper::* @@ -101,4 +101,3 @@ public class Level2RecompilationTest extends CompLevelsTest { super.checkLevel(expected, actual); } } - diff --git a/test/hotspot/jtreg/compiler/uncommontrap/TestDeoptOOM.java b/test/hotspot/jtreg/compiler/uncommontrap/TestDeoptOOM.java index 3dc9df2d73e..1f5fc3d36bd 100644 --- a/test/hotspot/jtreg/compiler/uncommontrap/TestDeoptOOM.java +++ b/test/hotspot/jtreg/compiler/uncommontrap/TestDeoptOOM.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,7 +27,7 @@ * @summary failed reallocations of scalar replaced objects during deoptimization causes crash * * @requires !vm.graal.enabled - * @run main/othervm -XX:-BackgroundCompilation -Xmx128M -XX:+IgnoreUnrecognizedVMOptions -XX:+VerifyStack + * @run main/othervm/timeout=480 -XX:-BackgroundCompilation -Xmx128M -XX:+IgnoreUnrecognizedVMOptions -XX:+VerifyStack * -XX:CompileCommand=exclude,compiler.uncommontrap.TestDeoptOOM::main * -XX:CompileCommand=exclude,compiler.uncommontrap.TestDeoptOOM::m9_1 * compiler.uncommontrap.TestDeoptOOM @@ -38,7 +38,7 @@ * @bug 8273456 * @summary Test that ttyLock is ranked above StackWatermark_lock * @requires !vm.graal.enabled & vm.gc.Z - * @run main/othervm -XX:-BackgroundCompilation -Xmx128M -XX:+IgnoreUnrecognizedVMOptions -XX:+VerifyStack + * @run main/othervm/timeout=480 -XX:-BackgroundCompilation -Xmx128M -XX:+IgnoreUnrecognizedVMOptions -XX:+VerifyStack * -XX:CompileCommand=exclude,compiler.uncommontrap.TestDeoptOOM::main * -XX:CompileCommand=exclude,compiler.uncommontrap.TestDeoptOOM::m9_1 * -XX:+UnlockDiagnosticVMOptions diff --git a/test/hotspot/jtreg/compiler/vectorapi/TestRawOopAtSafepoint.java b/test/hotspot/jtreg/compiler/vectorapi/TestRawOopAtSafepoint.java index 7af6296d16b..c9c574771c5 100644 --- a/test/hotspot/jtreg/compiler/vectorapi/TestRawOopAtSafepoint.java +++ b/test/hotspot/jtreg/compiler/vectorapi/TestRawOopAtSafepoint.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -32,7 +32,8 @@ import jdk.test.lib.Asserts; * @summary Verify that CheckCastPPs with raw oop inputs are not floating below a safepoint. * @library /test/lib * @modules jdk.incubator.vector - * @run main/othervm -XX:-TieredCompilation -Xbatch + * @run main/othervm/timeout=480 + * -XX:-TieredCompilation -Xbatch * -XX:CompileCommand=compileonly,compiler.vectorapi.TestRawOopAtSafepoint::test* * -XX:CompileCommand=dontinline,compiler.vectorapi.TestRawOopAtSafepoint::safepoint * compiler.vectorapi.TestRawOopAtSafepoint diff --git a/test/hotspot/jtreg/compiler/vectorization/TestFloat16VectorOperations.java b/test/hotspot/jtreg/compiler/vectorization/TestFloat16VectorOperations.java index 9c342574632..f3c27c4d278 100644 --- a/test/hotspot/jtreg/compiler/vectorization/TestFloat16VectorOperations.java +++ b/test/hotspot/jtreg/compiler/vectorization/TestFloat16VectorOperations.java @@ -29,7 +29,7 @@ * @modules jdk.incubator.vector * @library /test/lib / * @compile TestFloat16VectorOperations.java -* @run driver compiler.vectorization.TestFloat16VectorOperations +* @run driver/timeout=480 compiler.vectorization.TestFloat16VectorOperations */ package compiler.vectorization; diff --git a/test/hotspot/jtreg/compiler/vectorization/TestVectorZeroCount.java b/test/hotspot/jtreg/compiler/vectorization/TestVectorZeroCount.java index f4c8845b857..c30a28c46f9 100644 --- a/test/hotspot/jtreg/compiler/vectorization/TestVectorZeroCount.java +++ b/test/hotspot/jtreg/compiler/vectorization/TestVectorZeroCount.java @@ -26,7 +26,7 @@ * @requires vm.flavor == "server" & (vm.opt.TieredStopAtLevel == null | vm.opt.TieredStopAtLevel == 4) * @summary Ensure that vectorization of numberOfLeadingZeros and numberOfTrailingZeros outputs correct values * @library /test/lib / - * @run main/othervm compiler.vectorization.TestVectorZeroCount + * @run main/othervm/timeout=480 compiler.vectorization.TestVectorZeroCount */ package compiler.vectorization; diff --git a/test/hotspot/jtreg/gc/g1/TestGreyReclaimedHumongousObjects.java b/test/hotspot/jtreg/gc/g1/TestGreyReclaimedHumongousObjects.java index 0ee8cfdbaa4..1dee119401b 100644 --- a/test/hotspot/jtreg/gc/g1/TestGreyReclaimedHumongousObjects.java +++ b/test/hotspot/jtreg/gc/g1/TestGreyReclaimedHumongousObjects.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -29,7 +29,7 @@ package gc.g1; * @requires vm.gc.G1 * @summary Test handling of marked but unscanned reclaimed humongous objects. * @modules jdk.management - * @run main/othervm -XX:+UseG1GC -Xss32m -Xmx128m -XX:G1HeapRegionSize=1m + * @run main/othervm/timeout=480 -XX:+UseG1GC -Xss32m -Xmx128m -XX:G1HeapRegionSize=1m * gc.g1.TestGreyReclaimedHumongousObjects 1048576 90 */ diff --git a/test/hotspot/jtreg/gc/g1/humongousObjects/TestHumongousClassLoader.java b/test/hotspot/jtreg/gc/g1/humongousObjects/TestHumongousClassLoader.java index 813b002a8ea..5ade1fbee93 100644 --- a/test/hotspot/jtreg/gc/g1/humongousObjects/TestHumongousClassLoader.java +++ b/test/hotspot/jtreg/gc/g1/humongousObjects/TestHumongousClassLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -48,20 +48,20 @@ import java.nio.file.Paths; * @build jdk.test.whitebox.WhiteBox * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox * - * @run main/othervm/timeout=240 -Xms256M -Xmx256M -XX:+UseG1GC -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. + * @run main/othervm/timeout=960 -Xms256M -Xmx256M -XX:+UseG1GC -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. * gc.g1.humongousObjects.ClassLoaderGenerator 1 * - * @run main/othervm -Xms256M -Xmx256M -XX:+UseG1GC -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. + * @run main/othervm/timeout=480 -Xms256M -Xmx256M -XX:+UseG1GC -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. * -Xlog:class+load,class+unload=debug:file=TestHumongousClassLoader_Full_GC.log * -XX:G1HeapRegionSize=1M * gc.g1.humongousObjects.TestHumongousClassLoader FULL_GC * - * @run main/othervm -Xms256M -Xmx256M -XX:+UseG1GC -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. + * @run main/othervm/timeout=480 -Xms256M -Xmx256M -XX:+UseG1GC -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. * -Xlog:class+load,class+unload=debug:file=TestHumongousClassLoader_Full_GC_Mem_Pressure.log * -XX:G1HeapRegionSize=1M * gc.g1.humongousObjects.TestHumongousClassLoader FULL_GC_MEMORY_PRESSURE * - *@run main/othervm -Xms256M -Xmx256M -XX:+UseG1GC -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. + *@run main/othervm/timeout=480 -Xms256M -Xmx256M -XX:+UseG1GC -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. * -Xlog:class+load,class+unload=debug:file=TestHumongousClassLoader_CMC.log * -XX:G1HeapRegionSize=1M -XX:MaxTenuringThreshold=1 * gc.g1.humongousObjects.TestHumongousClassLoader CMC diff --git a/test/hotspot/jtreg/gc/g1/humongousObjects/TestHumongousNonArrayAllocation.java b/test/hotspot/jtreg/gc/g1/humongousObjects/TestHumongousNonArrayAllocation.java index c9bc1e0f14e..692e5017157 100644 --- a/test/hotspot/jtreg/gc/g1/humongousObjects/TestHumongousNonArrayAllocation.java +++ b/test/hotspot/jtreg/gc/g1/humongousObjects/TestHumongousNonArrayAllocation.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -44,23 +44,23 @@ import java.nio.file.Paths; * @build jdk.test.whitebox.WhiteBox * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox * - * @run main/othervm -Xms128M -Xmx128M -XX:+UseG1GC -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. + * @run main/othervm/timeout=480 -Xms128M -Xmx128M -XX:+UseG1GC -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. * -XX:G1HeapRegionSize=1M * gc.g1.humongousObjects.TestHumongousNonArrayAllocation LARGEST_NON_HUMONGOUS * - * @run main/othervm -Xms128M -Xmx128M -XX:+UseG1GC -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. + * @run main/othervm/timeout=480 -Xms128M -Xmx128M -XX:+UseG1GC -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. * -XX:G1HeapRegionSize=1M * gc.g1.humongousObjects.TestHumongousNonArrayAllocation SMALLEST_HUMONGOUS * - * @run main/othervm -Xms128M -Xmx128M -XX:+UseG1GC -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. + * @run main/othervm/timeout=480 -Xms128M -Xmx128M -XX:+UseG1GC -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. * -XX:G1HeapRegionSize=1M * gc.g1.humongousObjects.TestHumongousNonArrayAllocation ONE_REGION_HUMONGOUS * - * @run main/othervm -Xms128M -Xmx128M -XX:+UseG1GC -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. + * @run main/othervm/timeout=480 -Xms128M -Xmx128M -XX:+UseG1GC -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. * -XX:G1HeapRegionSize=1M * gc.g1.humongousObjects.TestHumongousNonArrayAllocation TWO_REGION_HUMONGOUS * - * @run main/othervm -Xms128M -Xmx128M -XX:+UseG1GC -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. + * @run main/othervm/timeout=480 -Xms128M -Xmx128M -XX:+UseG1GC -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. * -XX:G1HeapRegionSize=1M * gc.g1.humongousObjects.TestHumongousNonArrayAllocation MORE_THAN_TWO_REGION_HUMONGOUS * diff --git a/test/hotspot/jtreg/gc/g1/ihop/TestIHOPErgo.java b/test/hotspot/jtreg/gc/g1/ihop/TestIHOPErgo.java index b0adb1d489f..83080175a15 100644 --- a/test/hotspot/jtreg/gc/g1/ihop/TestIHOPErgo.java +++ b/test/hotspot/jtreg/gc/g1/ihop/TestIHOPErgo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -34,7 +34,7 @@ * @library /test/lib / * @modules java.base/jdk.internal.misc * @modules java.management - * @run driver/timeout=480 gc.g1.ihop.TestIHOPErgo + * @run driver/timeout=1920 gc.g1.ihop.TestIHOPErgo */ package gc.g1.ihop; diff --git a/test/hotspot/jtreg/gc/stress/TestMultiThreadStressRSet.java b/test/hotspot/jtreg/gc/stress/TestMultiThreadStressRSet.java index 0c742b7b4ef..a323ebd945a 100644 --- a/test/hotspot/jtreg/gc/stress/TestMultiThreadStressRSet.java +++ b/test/hotspot/jtreg/gc/stress/TestMultiThreadStressRSet.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -51,7 +51,7 @@ import jdk.test.lib.Utils; * -XX:+UseG1GC -XX:G1SummarizeRSetStatsPeriod=100 -Xlog:gc * -Xmx1G -XX:G1HeapRegionSize=8m -XX:MaxGCPauseMillis=1000 gc.stress.TestMultiThreadStressRSet 60 16 * - * @run main/othervm/timeout=700 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI + * @run main/othervm/timeout=1200 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI * -XX:+UseG1GC -XX:G1SummarizeRSetStatsPeriod=100 -Xlog:gc * -Xmx500m -XX:G1HeapRegionSize=1m -XX:MaxGCPauseMillis=1000 gc.stress.TestMultiThreadStressRSet 600 32 */ diff --git a/test/hotspot/jtreg/gc/stress/TestReclaimStringsLeaksMemory.java b/test/hotspot/jtreg/gc/stress/TestReclaimStringsLeaksMemory.java index 645583ec450..80ab9e21667 100644 --- a/test/hotspot/jtreg/gc/stress/TestReclaimStringsLeaksMemory.java +++ b/test/hotspot/jtreg/gc/stress/TestReclaimStringsLeaksMemory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -31,10 +31,10 @@ package gc.stress; * @requires !vm.debug * @library /test/lib * @modules java.base/jdk.internal.misc - * @run driver gc.stress.TestReclaimStringsLeaksMemory - * @run driver gc.stress.TestReclaimStringsLeaksMemory -XX:+UseSerialGC - * @run driver gc.stress.TestReclaimStringsLeaksMemory -XX:+UseParallelGC - * @run driver gc.stress.TestReclaimStringsLeaksMemory -XX:+UseG1GC + * @run driver/timeout=480 gc.stress.TestReclaimStringsLeaksMemory + * @run driver/timeout=480 gc.stress.TestReclaimStringsLeaksMemory -XX:+UseSerialGC + * @run driver/timeout=480 gc.stress.TestReclaimStringsLeaksMemory -XX:+UseParallelGC + * @run driver/timeout=480 gc.stress.TestReclaimStringsLeaksMemory -XX:+UseG1GC */ import java.util.Arrays; diff --git a/test/hotspot/jtreg/gc/stress/TestStressG1Humongous.java b/test/hotspot/jtreg/gc/stress/TestStressG1Humongous.java index 9f3c4286c0f..f92a562aa31 100644 --- a/test/hotspot/jtreg/gc/stress/TestStressG1Humongous.java +++ b/test/hotspot/jtreg/gc/stress/TestStressG1Humongous.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -31,7 +31,7 @@ package gc.stress; * @requires !vm.flightRecorder * @library /test/lib * @modules java.base/jdk.internal.misc - * @run driver/timeout=180 gc.stress.TestStressG1Humongous 4 3 1.1 120 + * @run driver/timeout=240 gc.stress.TestStressG1Humongous 4 3 1.1 120 */ /* @@ -40,7 +40,7 @@ package gc.stress; * @requires !vm.flightRecorder * @library /test/lib * @modules java.base/jdk.internal.misc - * @run driver/timeout=180 gc.stress.TestStressG1Humongous 16 5 2.1 120 + * @run driver/timeout=240 gc.stress.TestStressG1Humongous 16 5 2.1 120 */ /* @@ -49,7 +49,7 @@ package gc.stress; * @requires !vm.flightRecorder * @library /test/lib * @modules java.base/jdk.internal.misc - * @run driver/timeout=180 gc.stress.TestStressG1Humongous 32 4 0.6 120 + * @run driver/timeout=240 gc.stress.TestStressG1Humongous 32 4 0.6 120 */ /* @@ -58,7 +58,7 @@ package gc.stress; * @requires !vm.flightRecorder * @library /test/lib * @modules java.base/jdk.internal.misc - * @run driver/timeout=900 gc.stress.TestStressG1Humongous 1 7 0.6 600 + * @run driver/timeout=1200 gc.stress.TestStressG1Humongous 1 7 0.6 600 */ import java.util.ArrayList; diff --git a/test/hotspot/jtreg/gc/stress/TestStressRSetCoarsening.java b/test/hotspot/jtreg/gc/stress/TestStressRSetCoarsening.java index f7b6c77fdf3..7f91714d709 100644 --- a/test/hotspot/jtreg/gc/stress/TestStressRSetCoarsening.java +++ b/test/hotspot/jtreg/gc/stress/TestStressRSetCoarsening.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -38,7 +38,7 @@ import jdk.test.whitebox.WhiteBox; * @library /test/lib * @build jdk.test.whitebox.WhiteBox * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox - * @run main/othervm/timeout=300 + * @run main/othervm/timeout=1200 * -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI * -XX:+UseG1GC -Xlog:gc* -XX:MaxGCPauseMillis=1000 * -Xmx500m -XX:G1HeapRegionSize=1m gc.stress.TestStressRSetCoarsening 1 0 300 @@ -53,7 +53,7 @@ import jdk.test.whitebox.WhiteBox; * @library /test/lib * @build jdk.test.whitebox.WhiteBox * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox - * @run main/othervm/timeout=300 + * @run main/othervm/timeout=1200 * -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI * -XX:+UseG1GC -Xlog:gc* -XX:MaxGCPauseMillis=1000 * -Xmx500m -XX:G1HeapRegionSize=8m gc.stress.TestStressRSetCoarsening 1 10 300 @@ -68,7 +68,7 @@ import jdk.test.whitebox.WhiteBox; * @library /test/lib * @build jdk.test.whitebox.WhiteBox * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox - * @run main/othervm/timeout=300 + * @run main/othervm/timeout=1200 * -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI * -XX:+UseG1GC -Xlog:gc* -XX:MaxGCPauseMillis=1000 * -Xmx500m -XX:G1HeapRegionSize=32m gc.stress.TestStressRSetCoarsening 42 10 300 @@ -83,7 +83,7 @@ import jdk.test.whitebox.WhiteBox; * @library /test/lib * @build jdk.test.whitebox.WhiteBox * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox - * @run main/othervm/timeout=300 + * @run main/othervm/timeout=1200 * -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI * -XX:+UseG1GC -Xlog:gc* -XX:MaxGCPauseMillis=1000 * -Xmx500m -XX:G1HeapRegionSize=1m gc.stress.TestStressRSetCoarsening 2 0 300 @@ -98,7 +98,7 @@ import jdk.test.whitebox.WhiteBox; * @library /test/lib * @build jdk.test.whitebox.WhiteBox * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox - * @run main/othervm/timeout=1800 + * @run main/othervm/timeout=7200 * -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI * -XX:+UseG1GC -Xlog:gc* -XX:MaxGCPauseMillis=1000 * -Xmx1G -XX:G1HeapRegionSize=1m gc.stress.TestStressRSetCoarsening 500 0 1800 @@ -113,7 +113,7 @@ import jdk.test.whitebox.WhiteBox; * @library /test/lib * @build jdk.test.whitebox.WhiteBox * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox - * @run main/othervm/timeout=1800 + * @run main/othervm/timeout=7200 * -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI * -XX:+UseG1GC -Xlog:gc* -XX:MaxGCPauseMillis=1000 * -Xmx1G -XX:G1HeapRegionSize=1m gc.stress.TestStressRSetCoarsening 10 10 1800 diff --git a/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithG1.java b/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithG1.java index 64a090025ac..a3bb0944dd5 100644 --- a/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithG1.java +++ b/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithG1.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -31,7 +31,7 @@ package gc.stress.systemgc; * @library / * @requires vm.gc.G1 * @summary Stress the G1 GC full GC by allocating objects of different lifetimes concurrently with System.gc(). - * @run main/othervm/timeout=300 -Xlog:gc*=info -Xmx512m -XX:+UseG1GC gc.stress.systemgc.TestSystemGCWithG1 270 + * @run main/othervm/timeout=540 -Xlog:gc*=info -Xmx512m -XX:+UseG1GC gc.stress.systemgc.TestSystemGCWithG1 270 */ public class TestSystemGCWithG1 { public static void main(String[] args) throws Exception { diff --git a/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithParallel.java b/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithParallel.java index 07a510c7a4e..2b4bca5cf4b 100644 --- a/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithParallel.java +++ b/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithParallel.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -31,7 +31,7 @@ package gc.stress.systemgc; * @library / * @requires vm.gc.Parallel * @summary Stress the Parallel GC full GC by allocating objects of different lifetimes concurrently with System.gc(). - * @run main/othervm/timeout=300 -Xlog:gc=info -Xmx512m -XX:+UseParallelGC gc.stress.systemgc.TestSystemGCWithParallel 270 + * @run main/othervm/timeout=540 -Xlog:gc=info -Xmx512m -XX:+UseParallelGC gc.stress.systemgc.TestSystemGCWithParallel 270 */ public class TestSystemGCWithParallel { public static void main(String[] args) throws Exception { diff --git a/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithSerial.java b/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithSerial.java index 1db15b76e18..8571aee84c0 100644 --- a/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithSerial.java +++ b/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithSerial.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -31,7 +31,7 @@ package gc.stress.systemgc; * @library / * @requires vm.gc.Serial * @summary Stress the Serial GC full GC by allocating objects of different lifetimes concurrently with System.gc(). - * @run main/othervm/timeout=300 -Xlog:gc*=info -Xmx512m -XX:+UseSerialGC gc.stress.systemgc.TestSystemGCWithSerial 270 + * @run main/othervm/timeout=540 -Xlog:gc*=info -Xmx512m -XX:+UseSerialGC gc.stress.systemgc.TestSystemGCWithSerial 270 */ public class TestSystemGCWithSerial { public static void main(String[] args) throws Exception { diff --git a/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithShenandoah.java b/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithShenandoah.java index 13129552873..ea475d42e0c 100644 --- a/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithShenandoah.java +++ b/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithShenandoah.java @@ -32,12 +32,12 @@ package gc.stress.systemgc; * @requires vm.gc.Shenandoah * @summary Stress the Shenandoah GC full GC by allocating objects of different lifetimes concurrently with System.gc(). * - * @run main/othervm/timeout=300 -Xlog:gc*=info -Xmx512m -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions + * @run main/othervm/timeout=540 -Xlog:gc*=info -Xmx512m -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions * -XX:+UseShenandoahGC * -XX:+ShenandoahVerify * gc.stress.systemgc.TestSystemGCWithShenandoah 270 * - * @run main/othervm/timeout=300 -Xlog:gc*=info -Xmx512m -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions + * @run main/othervm/timeout=540 -Xlog:gc*=info -Xmx512m -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions * -XX:+UseShenandoahGC * gc.stress.systemgc.TestSystemGCWithShenandoah 270 */ @@ -49,12 +49,12 @@ package gc.stress.systemgc; * @requires vm.gc.Shenandoah * @summary Stress the Shenandoah GC full GC by allocating objects of different lifetimes concurrently with System.gc(). * - * @run main/othervm/timeout=300 -Xlog:gc*=info -Xmx512m -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions + * @run main/othervm/timeout=540 -Xlog:gc*=info -Xmx512m -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions * -XX:+UseShenandoahGC -XX:ShenandoahGCMode=generational * -XX:+ShenandoahVerify * gc.stress.systemgc.TestSystemGCWithShenandoah 270 * - * @run main/othervm/timeout=300 -Xlog:gc*=info -Xmx512m -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions + * @run main/othervm/timeout=540 -Xlog:gc*=info -Xmx512m -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions * -XX:+UseShenandoahGC -XX:ShenandoahGCMode=generational * gc.stress.systemgc.TestSystemGCWithShenandoah 270 */ diff --git a/test/hotspot/jtreg/gc/z/TestUncommit.java b/test/hotspot/jtreg/gc/z/TestUncommit.java index afb736501dd..0e674358be5 100644 --- a/test/hotspot/jtreg/gc/z/TestUncommit.java +++ b/test/hotspot/jtreg/gc/z/TestUncommit.java @@ -27,7 +27,7 @@ package gc.z; * @test TestUncommit * @requires vm.gc.Z * @summary Test ZGC uncommit unused memory - * @run main/othervm -XX:+UseZGC -Xlog:gc*,gc+heap=debug,gc+stats=off -Xms128M -Xmx512M -XX:ZUncommitDelay=5 gc.z.TestUncommit + * @run main/othervm/timeout=480 -XX:+UseZGC -Xlog:gc*,gc+heap=debug,gc+stats=off -Xms128M -Xmx512M -XX:ZUncommitDelay=5 gc.z.TestUncommit */ import java.util.ArrayList; diff --git a/test/hotspot/jtreg/gtest/GTestWrapper.java b/test/hotspot/jtreg/gtest/GTestWrapper.java index 1bd9734e48c..2ee174b11be 100644 --- a/test/hotspot/jtreg/gtest/GTestWrapper.java +++ b/test/hotspot/jtreg/gtest/GTestWrapper.java @@ -27,7 +27,7 @@ * @modules java.base/jdk.internal.misc * java.xml * @requires vm.flagless - * @run main/native GTestWrapper + * @run main/native/timeout=480 GTestWrapper */ import jdk.test.lib.Platform; diff --git a/test/hotspot/jtreg/runtime/8176717/TestInheritFD.java b/test/hotspot/jtreg/runtime/8176717/TestInheritFD.java index f2a17acdd64..8130ff65792 100644 --- a/test/hotspot/jtreg/runtime/8176717/TestInheritFD.java +++ b/test/hotspot/jtreg/runtime/8176717/TestInheritFD.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -56,7 +56,7 @@ import java.util.stream.Stream; * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @run driver TestInheritFD + * @run driver/timeout=480 TestInheritFD */ /** @@ -78,6 +78,8 @@ import java.util.stream.Stream; * the third VM. */ +import jdk.test.lib.Utils; + public class TestInheritFD { public static final String LEAKS_FD = "VM RESULT => LEAKS FD"; @@ -90,8 +92,7 @@ public class TestInheritFD { public static final String THIRD_VM_PID_PREFIX = "Third VM pid="; public static final String THIRD_VM_WAITING_PREFIX = "Third VM waiting for second VM pid="; - public static float timeoutFactor = Float.parseFloat(System.getProperty("test.timeout.factor", "1.0")); - public static long subProcessTimeout = (long)(15L * timeoutFactor); + public static long subProcessTimeout = (long)(15L * Utils.TIMEOUT_FACTOR); // Extract a pid from the specified String at the specified start offset. private static long extractPidFromStringOffset(String str, int start) { diff --git a/test/hotspot/jtreg/runtime/CreateMirror/ArraysNewInstanceBug.java b/test/hotspot/jtreg/runtime/CreateMirror/ArraysNewInstanceBug.java index cb45f00d666..743e0372ab1 100644 --- a/test/hotspot/jtreg/runtime/CreateMirror/ArraysNewInstanceBug.java +++ b/test/hotspot/jtreg/runtime/CreateMirror/ArraysNewInstanceBug.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ * @bug 8182397 * @summary race in setting array_klass field for component mirror with mirror update for klass * @modules java.base/jdk.internal.misc - * @run main/othervm -Xcomp ArraysNewInstanceBug + * @run main/othervm/timeout=480 -Xcomp ArraysNewInstanceBug */ // This test crashes in compiled code with race, because the compiler generates code that assumes this ordering. diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/CreateCoredumpOnCrash.java b/test/hotspot/jtreg/runtime/ErrorHandling/CreateCoredumpOnCrash.java index 2fb42e230a5..12755cba243 100644 --- a/test/hotspot/jtreg/runtime/ErrorHandling/CreateCoredumpOnCrash.java +++ b/test/hotspot/jtreg/runtime/ErrorHandling/CreateCoredumpOnCrash.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -28,7 +28,7 @@ * java.compiler * java.management * jdk.internal.jvmstat/sun.jvmstat.monitor - * @run driver CreateCoredumpOnCrash + * @run driver/timeout=480 CreateCoredumpOnCrash * @requires vm.flagless * @requires !vm.asan */ diff --git a/test/hotspot/jtreg/runtime/InvocationTests/invocationC1Tests.java b/test/hotspot/jtreg/runtime/InvocationTests/invocationC1Tests.java index 0e4f01bb55f..a21c6b2b233 100644 --- a/test/hotspot/jtreg/runtime/InvocationTests/invocationC1Tests.java +++ b/test/hotspot/jtreg/runtime/InvocationTests/invocationC1Tests.java @@ -32,7 +32,7 @@ * @modules java.base/jdk.internal.misc * @compile invokespecial/Checker.java invokespecial/ClassGenerator.java invokespecial/Generator.java * - * @run driver/timeout=1800 invocationC1Tests special + * @run driver/timeout=7200 invocationC1Tests special */ /* @@ -45,7 +45,7 @@ * @modules java.base/jdk.internal.misc * @compile invokevirtual/Checker.java invokevirtual/ClassGenerator.java invokevirtual/Generator.java * - * @run driver/timeout=1800 invocationC1Tests virtual + * @run driver/timeout=7200 invocationC1Tests virtual */ /* @@ -58,7 +58,7 @@ * @modules java.base/jdk.internal.misc * @compile invokeinterface/Checker.java invokeinterface/ClassGenerator.java invokeinterface/Generator.java * - * @run driver/timeout=1800 invocationC1Tests interface + * @run driver/timeout=7200 invocationC1Tests interface */ import jdk.test.lib.process.ProcessTools; diff --git a/test/hotspot/jtreg/runtime/InvocationTests/invokeinterfaceTests.java b/test/hotspot/jtreg/runtime/InvocationTests/invokeinterfaceTests.java index 1cf175030be..fdbffb3afcf 100644 --- a/test/hotspot/jtreg/runtime/InvocationTests/invokeinterfaceTests.java +++ b/test/hotspot/jtreg/runtime/InvocationTests/invokeinterfaceTests.java @@ -33,7 +33,7 @@ * @compile invokeinterface/Checker.java invokeinterface/ClassGenerator.java * invokeinterface/Generator.java * - * @run driver/timeout=1800 invokeinterfaceTests current-int + * @run driver/timeout=5400 invokeinterfaceTests current-int */ /* @@ -47,7 +47,7 @@ * @compile invokeinterface/Checker.java invokeinterface/ClassGenerator.java * invokeinterface/Generator.java * - * @run driver/timeout=1800 invokeinterfaceTests current-comp + * @run driver/timeout=5400 invokeinterfaceTests current-comp */ /* @@ -61,7 +61,7 @@ * @compile invokeinterface/Checker.java invokeinterface/ClassGenerator.java * invokeinterface/Generator.java * - * @run driver/timeout=1800 invokeinterfaceTests old-int + * @run driver/timeout=5400 invokeinterfaceTests old-int */ import jdk.test.lib.process.ProcessTools; diff --git a/test/hotspot/jtreg/runtime/LoadClass/TestResize.java b/test/hotspot/jtreg/runtime/LoadClass/TestResize.java index 9177ede52da..bb4ebe358e4 100644 --- a/test/hotspot/jtreg/runtime/LoadClass/TestResize.java +++ b/test/hotspot/jtreg/runtime/LoadClass/TestResize.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -31,7 +31,7 @@ * @modules java.base/jdk.internal.misc * java.management * @compile TriggerResize.java - * @run driver TestResize + * @run driver/timeout=480 TestResize */ import jdk.test.lib.Platform; diff --git a/test/hotspot/jtreg/runtime/NMT/VirtualAllocCommitMerge.java b/test/hotspot/jtreg/runtime/NMT/VirtualAllocCommitMerge.java index 4d691eb920a..fd4444ccd88 100644 --- a/test/hotspot/jtreg/runtime/NMT/VirtualAllocCommitMerge.java +++ b/test/hotspot/jtreg/runtime/NMT/VirtualAllocCommitMerge.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -32,7 +32,7 @@ * java.management * @build jdk.test.whitebox.WhiteBox * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox - * @run main/othervm -Xbootclasspath/a:. -Xint -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail VirtualAllocCommitMerge + * @run main/othervm/timeout=480 -Xbootclasspath/a:. -Xint -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail VirtualAllocCommitMerge * */ diff --git a/test/hotspot/jtreg/runtime/SelectionResolution/InvokeInterfaceICCE.java b/test/hotspot/jtreg/runtime/SelectionResolution/InvokeInterfaceICCE.java index 9212b2d0032..f00ed1636e2 100644 --- a/test/hotspot/jtreg/runtime/SelectionResolution/InvokeInterfaceICCE.java +++ b/test/hotspot/jtreg/runtime/SelectionResolution/InvokeInterfaceICCE.java @@ -28,7 +28,7 @@ * @requires vm.opt.final.ClassUnloading * @library /testlibrary/asm * @library /runtime/SelectionResolution/classes - * @run main/othervm/timeout=500 -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies InvokeInterfaceICCE + * @run main/othervm/timeout=2000 -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies InvokeInterfaceICCE */ import java.util.Arrays; diff --git a/test/hotspot/jtreg/runtime/SelectionResolution/InvokeInterfaceSuccessTest.java b/test/hotspot/jtreg/runtime/SelectionResolution/InvokeInterfaceSuccessTest.java index 4eb3c06e637..f27c03308e9 100644 --- a/test/hotspot/jtreg/runtime/SelectionResolution/InvokeInterfaceSuccessTest.java +++ b/test/hotspot/jtreg/runtime/SelectionResolution/InvokeInterfaceSuccessTest.java @@ -28,7 +28,7 @@ * @requires vm.opt.final.ClassUnloading * @library /testlibrary/asm * @library /runtime/SelectionResolution/classes - * @run main/othervm/timeout=300 -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies InvokeInterfaceSuccessTest + * @run main/othervm/timeout=1200 -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies InvokeInterfaceSuccessTest */ import java.util.Arrays; diff --git a/test/hotspot/jtreg/runtime/SelectionResolution/InvokeVirtualICCE.java b/test/hotspot/jtreg/runtime/SelectionResolution/InvokeVirtualICCE.java index c041bca153d..1a0e67aeeab 100644 --- a/test/hotspot/jtreg/runtime/SelectionResolution/InvokeVirtualICCE.java +++ b/test/hotspot/jtreg/runtime/SelectionResolution/InvokeVirtualICCE.java @@ -28,7 +28,7 @@ * @requires vm.opt.final.ClassUnloading * @library /testlibrary/asm * @library /runtime/SelectionResolution/classes - * @run main/othervm/timeout=1200 -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies InvokeVirtualICCE + * @run main/othervm/timeout=4800 -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies InvokeVirtualICCE */ import java.util.Arrays; diff --git a/test/hotspot/jtreg/runtime/SelectionResolution/InvokeVirtualSuccessTest.java b/test/hotspot/jtreg/runtime/SelectionResolution/InvokeVirtualSuccessTest.java index a20e934d651..821b11169ab 100644 --- a/test/hotspot/jtreg/runtime/SelectionResolution/InvokeVirtualSuccessTest.java +++ b/test/hotspot/jtreg/runtime/SelectionResolution/InvokeVirtualSuccessTest.java @@ -28,7 +28,7 @@ * @requires vm.opt.final.ClassUnloading * @library /testlibrary/asm * @library /runtime/SelectionResolution/classes - * @run main/othervm/timeout=400 -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies InvokeVirtualSuccessTest + * @run main/othervm/timeout=1600 -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies InvokeVirtualSuccessTest */ import java.util.Arrays; diff --git a/test/hotspot/jtreg/runtime/Thread/TestThreadDumpMonitorContention.java b/test/hotspot/jtreg/runtime/Thread/TestThreadDumpMonitorContention.java index a8f8660272d..6dc6d04a737 100644 --- a/test/hotspot/jtreg/runtime/Thread/TestThreadDumpMonitorContention.java +++ b/test/hotspot/jtreg/runtime/Thread/TestThreadDumpMonitorContention.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -30,7 +30,7 @@ * * @library /test/lib * @modules java.base/jdk.internal.misc - * @run main/othervm TestThreadDumpMonitorContention + * @run main/othervm/timeout=480 TestThreadDumpMonitorContention */ import java.io.BufferedReader; diff --git a/test/hotspot/jtreg/runtime/cds/DeterministicDump.java b/test/hotspot/jtreg/runtime/cds/DeterministicDump.java index 202262a8117..d26ca8cc7cf 100644 --- a/test/hotspot/jtreg/runtime/cds/DeterministicDump.java +++ b/test/hotspot/jtreg/runtime/cds/DeterministicDump.java @@ -29,7 +29,7 @@ * @library /test/lib * @build jdk.test.whitebox.WhiteBox * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox - * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions + * @run main/othervm/timeout=480 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI DeterministicDump */ diff --git a/test/hotspot/jtreg/runtime/cds/appcds/LotsOfSyntheticClasses.java b/test/hotspot/jtreg/runtime/cds/appcds/LotsOfSyntheticClasses.java index 3c3db7d0397..bb3d33218a2 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/LotsOfSyntheticClasses.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/LotsOfSyntheticClasses.java @@ -37,7 +37,7 @@ import jdk.test.lib.process.OutputAnalyzer; * @summary Try to archive lots and lots of classes. * @requires vm.cds * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds - * @run driver/timeout=500 LotsOfSyntheticClasses + * @run driver/timeout=8000 LotsOfSyntheticClasses */ public class LotsOfSyntheticClasses { diff --git a/test/hotspot/jtreg/runtime/cds/appcds/TestCommon.java b/test/hotspot/jtreg/runtime/cds/appcds/TestCommon.java index 5d1e3831d86..16e691c9a13 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/TestCommon.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/TestCommon.java @@ -22,30 +22,22 @@ * */ -import jdk.test.lib.Utils; -import jdk.test.lib.BuildHelper; -import jdk.test.lib.JDKToolFinder; -import jdk.test.lib.Platform; -import jdk.test.lib.cds.CDSOptions; -import jdk.test.lib.cds.CDSTestUtils; -import jdk.test.lib.cds.CDSTestUtils.Result; -import jdk.test.lib.process.ProcessTools; -import jdk.test.lib.process.OutputAnalyzer; +import cdsutils.DynamicDumpHelper; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.net.URI; import java.nio.file.DirectoryStream; -import java.nio.file.Files; import java.nio.file.FileSystem; import java.nio.file.FileSystems; +import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.text.SimpleDateFormat; -import java.util.Arrays; import java.util.ArrayList; +import java.util.Arrays; import java.util.Date; import java.util.Enumeration; import java.util.regex.Matcher; @@ -53,8 +45,17 @@ import java.util.regex.Pattern; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; import java.util.zip.ZipOutputStream; +import jdk.test.lib.BuildHelper; +import jdk.test.lib.JDKToolFinder; +import jdk.test.lib.Platform; +import jdk.test.lib.Utils; +import jdk.test.lib.Utils; +import jdk.test.lib.cds.CDSOptions; +import jdk.test.lib.cds.CDSTestUtils.Result; +import jdk.test.lib.cds.CDSTestUtils; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import jtreg.SkippedException; -import cdsutils.DynamicDumpHelper; /** @@ -76,9 +77,6 @@ public class TestCommon extends CDSTestUtils { private static final SimpleDateFormat timeStampFormat = new SimpleDateFormat("HH'h'mm'm'ss's'SSS"); - private static final String timeoutFactor = - System.getProperty("test.timeout.factor", "1.0"); - private static String currentArchiveName; // Call this method to start new archive with new unique name @@ -420,7 +418,7 @@ public class TestCommon extends CDSTestUtils { cmd.add("-Xshare:" + opts.xShareMode); cmd.add("-showversion"); cmd.add("-XX:SharedArchiveFile=" + getCurrentArchiveName()); - cmd.add("-Dtest.timeout.factor=" + timeoutFactor); + cmd.add("-Dtest.timeout.factor=" + Utils.TIMEOUT_FACTOR); if (opts.appJar != null) { cmd.add("-cp"); diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeCompressedOopsTest.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeCompressedOopsTest.java index 4587eeae5e5..e1d132dd984 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeCompressedOopsTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeCompressedOopsTest.java @@ -32,12 +32,12 @@ * subtests with this flag. * @library /test/lib /test/setup_aot * @build AOTCodeCompressedOopsTest JavacBenchApp - * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar + * @run driver/timeout=480 jdk.test.lib.helpers.ClassFileInstaller -jar app.jar * JavacBenchApp * JavacBenchApp$ClassFile * JavacBenchApp$FileManager * JavacBenchApp$SourceFile - * @run driver AOTCodeCompressedOopsTest + * @run driver/timeout=480 AOTCodeCompressedOopsTest */ import java.util.ArrayList; diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotProfile/AOTProfileFlags.java b/test/hotspot/jtreg/runtime/cds/appcds/aotProfile/AOTProfileFlags.java index fe9c7e7bbb7..4dc4512e01c 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/aotProfile/AOTProfileFlags.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/aotProfile/AOTProfileFlags.java @@ -36,7 +36,7 @@ * JavacBenchApp$FileManager * JavacBenchApp$SourceFile * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar hello.jar Hello - * @run driver AOTProfileFlags + * @run driver/timeout=480 AOTProfileFlags */ import jdk.test.lib.cds.CDSTestUtils; diff --git a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsStress.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsStress.java index 5871305139e..1114870d1d3 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsStress.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsStress.java @@ -28,7 +28,7 @@ * @requires vm.cds.write.archived.java.heap * @library /test/hotspot/jtreg/runtime/cds/appcds /test/lib * @build HelloString - * @run driver/timeout=650 SharedStringsStress + * @run driver/timeout=2600 SharedStringsStress */ import java.io.File; import java.io.FileOutputStream; diff --git a/test/hotspot/jtreg/runtime/exceptionMsgs/ArrayIndexOutOfBoundsException/ArrayIndexOutOfBoundsExceptionTest.java b/test/hotspot/jtreg/runtime/exceptionMsgs/ArrayIndexOutOfBoundsException/ArrayIndexOutOfBoundsExceptionTest.java index 434864ff3bf..cf316a8bfd6 100644 --- a/test/hotspot/jtreg/runtime/exceptionMsgs/ArrayIndexOutOfBoundsException/ArrayIndexOutOfBoundsExceptionTest.java +++ b/test/hotspot/jtreg/runtime/exceptionMsgs/ArrayIndexOutOfBoundsException/ArrayIndexOutOfBoundsExceptionTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2018, 2019 SAP SE. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -34,8 +34,8 @@ * @test * @requires !vm.graal.enabled * @comment These test C1 and C2 so make no sense when Graal is enabled. - * @run testng/othervm -Xcomp -XX:-TieredCompilation ArrayIndexOutOfBoundsExceptionTest - * @run testng/othervm -Xcomp -XX:TieredStopAtLevel=1 ArrayIndexOutOfBoundsExceptionTest + * @run testng/othervm/timeout=480 -Xcomp -XX:-TieredCompilation ArrayIndexOutOfBoundsExceptionTest + * @run testng/othervm/timeout=480 -Xcomp -XX:TieredStopAtLevel=1 ArrayIndexOutOfBoundsExceptionTest */ import java.io.ByteArrayInputStream; diff --git a/test/hotspot/jtreg/runtime/logging/RedefineClasses.java b/test/hotspot/jtreg/runtime/logging/RedefineClasses.java index 8b75802cd3b..a013ebdea54 100644 --- a/test/hotspot/jtreg/runtime/logging/RedefineClasses.java +++ b/test/hotspot/jtreg/runtime/logging/RedefineClasses.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -31,7 +31,7 @@ * java.instrument * @requires vm.jvmti * @run main RedefineClassHelper - * @run main/othervm -Xmx256m -XX:MaxMetaspaceSize=64m -javaagent:redefineagent.jar -Xlog:all=trace:file=all.log RedefineClasses + * @run main/othervm/timeout=480 -Xmx256m -XX:MaxMetaspaceSize=64m -javaagent:redefineagent.jar -Xlog:all=trace:file=all.log RedefineClasses */ // package access top-level class to avoid problem with RedefineClassHelper diff --git a/test/hotspot/jtreg/runtime/reflect/ReflectOutOfMemoryError.java b/test/hotspot/jtreg/runtime/reflect/ReflectOutOfMemoryError.java index 09646d07358..69cfade4521 100644 --- a/test/hotspot/jtreg/runtime/reflect/ReflectOutOfMemoryError.java +++ b/test/hotspot/jtreg/runtime/reflect/ReflectOutOfMemoryError.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,7 +25,7 @@ * @test * @bug 8297977 * @summary Test that throwing OOM from reflected method gets InvocationTargetException - * @run main/othervm -Xmx128m ReflectOutOfMemoryError + * @run main/othervm/timeout=480 -Xmx128m ReflectOutOfMemoryError */ import java.lang.reflect.*; diff --git a/test/hotspot/jtreg/serviceability/HeapDump/UnmountedVThreadNativeMethodAtTop.java b/test/hotspot/jtreg/serviceability/HeapDump/UnmountedVThreadNativeMethodAtTop.java index 7980b5ae28d..04086c49a4d 100644 --- a/test/hotspot/jtreg/serviceability/HeapDump/UnmountedVThreadNativeMethodAtTop.java +++ b/test/hotspot/jtreg/serviceability/HeapDump/UnmountedVThreadNativeMethodAtTop.java @@ -29,7 +29,7 @@ * @library /test/lib * @build jdk.test.whitebox.WhiteBox * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox - * @run junit/othervm/native -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI --enable-native-access=ALL-UNNAMED UnmountedVThreadNativeMethodAtTop + * @run junit/othervm/native/timeout=480 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI --enable-native-access=ALL-UNNAMED UnmountedVThreadNativeMethodAtTop */ import java.lang.management.ManagementFactory; diff --git a/test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorThreadTest.java b/test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorThreadTest.java index 38fd16808cd..17565899a64 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorThreadTest.java +++ b/test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorThreadTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2018, Google and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -30,7 +30,7 @@ package MyPackage; * @summary Verifies the JVMTI Heap Monitor Thread information sanity. * @requires vm.jvmti * @compile HeapMonitorThreadTest.java - * @run main/othervm/native -Xmx512m -agentlib:HeapMonitorTest MyPackage.HeapMonitorThreadTest + * @run main/othervm/native/timeout=480 -Xmx512m -agentlib:HeapMonitorTest MyPackage.HeapMonitorThreadTest */ import java.util.List; diff --git a/test/hotspot/jtreg/serviceability/jvmti/SetTag/TagMapTest.java b/test/hotspot/jtreg/serviceability/jvmti/SetTag/TagMapTest.java index d75f56714a4..136381e2111 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/SetTag/TagMapTest.java +++ b/test/hotspot/jtreg/serviceability/jvmti/SetTag/TagMapTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,9 +26,9 @@ * @bug 8306843 * @summary Test that 10M tags doesn't time out. * @requires vm.jvmti - * @run main/othervm/native -agentlib:TagMapTest - * -Xlog:jvmti+table - * TagMapTest + * @run main/othervm/native/timeout=480 -agentlib:TagMapTest + * -Xlog:jvmti+table + * TagMapTest */ import java.util.ArrayList; diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume2/SuspendResume2.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume2/SuspendResume2.java index b773cf3fa0a..80dd42c480a 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume2/SuspendResume2.java +++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume2/SuspendResume2.java @@ -28,7 +28,7 @@ * @library /test/lib * @compile SuspendResume2.java * @run driver jdk.test.lib.FileInstaller . . - * @run main/othervm/native + * @run main/othervm/native/timeout=700 * -Djdk.virtualThreadScheduler.maxPoolSize=1 * -agentlib:SuspendResume2 * SuspendResume2 @@ -40,7 +40,7 @@ * @library /test/lib * @compile SuspendResume2.java * @run driver jdk.test.lib.FileInstaller . . - * @run main/othervm/native + * @run main/othervm/native/timeout=700 * -Djdk.virtualThreadScheduler.maxPoolSize=1 * -agentlib:SuspendResume2 * -XX:-VerifyContinuations @@ -53,7 +53,7 @@ * @library /test/lib * @compile SuspendResume2.java * @run driver jdk.test.lib.FileInstaller . . - * @run main/othervm/native + * @run main/othervm/native/timeout=700 * -agentlib:SuspendResume2 * -XX:+UnlockExperimentalVMOptions * -XX:-VMContinuations diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbDumpheap.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbDumpheap.java index fef7c827eb7..ee9872867ac 100644 --- a/test/hotspot/jtreg/serviceability/sa/ClhsdbDumpheap.java +++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbDumpheap.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -46,7 +46,7 @@ import jtreg.SkippedException; * timeouts. As there is no known direct benefit from running the test * with -Xcomp, we disable such testing. * @library /test/lib - * @run main/othervm/timeout=240 ClhsdbDumpheap + * @run main/othervm/timeout=960 ClhsdbDumpheap */ public class ClhsdbDumpheap { diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbFindPC.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbFindPC.java index c75a38490d5..7ced4c9515b 100644 --- a/test/hotspot/jtreg/serviceability/sa/ClhsdbFindPC.java +++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbFindPC.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -41,7 +41,7 @@ import jtreg.SkippedException; * @requires vm.compiler1.enabled * @requires vm.opt.DeoptimizeALot != true * @library /test/lib - * @run main/othervm/timeout=480 ClhsdbFindPC true false + * @run main/othervm/timeout=1920 ClhsdbFindPC true false */ /** @@ -53,7 +53,7 @@ import jtreg.SkippedException; * @requires vm.compiler1.enabled * @requires vm.opt.DeoptimizeALot != true * @library /test/lib - * @run main/othervm/timeout=480 ClhsdbFindPC true true + * @run main/othervm/timeout=1920 ClhsdbFindPC true true */ /** @@ -64,7 +64,7 @@ import jtreg.SkippedException; * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*")) * @requires vm.compiler1.enabled * @library /test/lib - * @run main/othervm/timeout=480 ClhsdbFindPC false false + * @run main/othervm/timeout=1920 ClhsdbFindPC false false */ /** @@ -74,7 +74,7 @@ import jtreg.SkippedException; * @requires vm.hasSA * @requires vm.compiler1.enabled * @library /test/lib - * @run main/othervm/timeout=480 ClhsdbFindPC false true + * @run main/othervm/timeout=1920 ClhsdbFindPC false true */ public class ClhsdbFindPC { diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbJstackXcompStress.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbJstackXcompStress.java index 7e06cb3af95..bb35e6c5aff 100644 --- a/test/hotspot/jtreg/serviceability/sa/ClhsdbJstackXcompStress.java +++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbJstackXcompStress.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2019, Red Hat Inc. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -39,7 +39,7 @@ import jdk.test.lib.process.OutputAnalyzer; * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*")) * @requires vm.opt.DeoptimizeALot != true * @library /test/lib - * @run driver/timeout=300 ClhsdbJstackXcompStress + * @run driver/timeout=1200 ClhsdbJstackXcompStress */ public class ClhsdbJstackXcompStress { diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbThreadContext.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbThreadContext.java index 988227f3961..5c3092a139d 100644 --- a/test/hotspot/jtreg/serviceability/sa/ClhsdbThreadContext.java +++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbThreadContext.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -35,7 +35,7 @@ import jtreg.SkippedException; * @requires vm.hasSA * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*")) * @library /test/lib - * @run main/othervm ClhsdbThreadContext + * @run main/othervm/timeout=480 ClhsdbThreadContext */ public class ClhsdbThreadContext { diff --git a/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackLineNumbers.java b/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackLineNumbers.java index 87e664ef308..15b9aa9ccae 100644 --- a/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackLineNumbers.java +++ b/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackLineNumbers.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -41,7 +41,7 @@ import jdk.test.lib.SA.SATestUtils; * @requires os.family=="windows" | os.family == "linux" | os.family == "mac" * @requires vm.flagless * @library /test/lib - * @run driver TestJhsdbJstackLineNumbers + * @run driver/timeout=480 TestJhsdbJstackLineNumbers */ /* diff --git a/test/hotspot/jtreg/serviceability/sa/TestObjectAlignment.java b/test/hotspot/jtreg/serviceability/sa/TestObjectAlignment.java index 28d6f74c689..62fe2f5d7aa 100644 --- a/test/hotspot/jtreg/serviceability/sa/TestObjectAlignment.java +++ b/test/hotspot/jtreg/serviceability/sa/TestObjectAlignment.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -42,7 +42,7 @@ import jdk.test.lib.Utils; * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*")) * @modules jdk.hotspot.agent/sun.jvm.hotspot * jdk.hotspot.agent/sun.jvm.hotspot.runtime - * @run driver TestObjectAlignment + * @run driver/timeout=480 TestObjectAlignment */ public class TestObjectAlignment { diff --git a/test/hotspot/jtreg/serviceability/sa/sadebugd/SADebugDTest.java b/test/hotspot/jtreg/serviceability/sa/sadebugd/SADebugDTest.java index ebdd69e7d40..69f4c9eb454 100644 --- a/test/hotspot/jtreg/serviceability/sa/sadebugd/SADebugDTest.java +++ b/test/hotspot/jtreg/serviceability/sa/sadebugd/SADebugDTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -32,7 +32,7 @@ * @modules java.base/jdk.internal.misc * @library /test/lib * - * @run driver SADebugDTest + * @run driver/timeout=480 SADebugDTest */ import java.util.concurrent.TimeUnit; @@ -125,7 +125,7 @@ public class SADebugDTest { // The startProcess will block until the 'golden' string appears in either process' stdout or stderr // In case of timeout startProcess kills the debugd process - Process debugd = startProcess("debugd", pb, null, l -> checkOutput(l, useRmiPort, rmiPort), 20, TimeUnit.SECONDS); + Process debugd = startProcess("debugd", pb, null, l -> checkOutput(l, useRmiPort, rmiPort), 80, TimeUnit.SECONDS); // If we are here, this means we have received the golden line and the test has passed // The debugd remains running, we have to kill it diff --git a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestNotCompilable.java b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestNotCompilable.java index 8ba72f1bd86..bf8de679dfa 100644 --- a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestNotCompilable.java +++ b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestNotCompilable.java @@ -33,7 +33,7 @@ import compiler.lib.ir_framework.driver.irmatching.IRViolationException; * @requires vm.compiler2.enabled & vm.flagless & vm.debug == true * @summary Test the functionality of allowNotCompilable. * @library /test/lib / - * @run driver ir_framework.tests.TestNotCompilable + * @run driver/timeout=480 ir_framework.tests.TestNotCompilable */ public class TestNotCompilable { diff --git a/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/tests/unloading_redefinition_inMemoryCompilation_keep_class/TestDescription.java b/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/tests/unloading_redefinition_inMemoryCompilation_keep_class/TestDescription.java index 51d787ec218..10bafe26ae4 100644 --- a/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/tests/unloading_redefinition_inMemoryCompilation_keep_class/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/tests/unloading_redefinition_inMemoryCompilation_keep_class/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -42,7 +42,7 @@ * @requires vm.opt.ClassUnloadingWithConcurrentMark != false * @build jdk.test.whitebox.WhiteBox * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox - * @run main/othervm + * @run main/othervm/timeout=480 * -Xbootclasspath/a:. * -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI diff --git a/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/tests/unloading_redefinition_inMemoryCompilation_keep_obj/TestDescription.java b/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/tests/unloading_redefinition_inMemoryCompilation_keep_obj/TestDescription.java index 4d681af1e28..03108809ebd 100644 --- a/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/tests/unloading_redefinition_inMemoryCompilation_keep_obj/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/tests/unloading_redefinition_inMemoryCompilation_keep_obj/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -42,7 +42,7 @@ * @requires vm.opt.ClassUnloadingWithConcurrentMark != false * @build jdk.test.whitebox.WhiteBox * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox - * @run main/othervm + * @run main/othervm/timeout=480 * -Xbootclasspath/a:. * -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI diff --git a/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large001/large001.java b/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large001/large001.java index 4d93785e5c6..8f8cfdcd541 100644 --- a/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large001/large001.java +++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large001/large001.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -59,7 +59,7 @@ * @comment generate and compile nsk.share.gc.newclass.* classes * @run driver nsk.share.gc.GenClassesBuilder * - * @run main/othervm/timeout=300 + * @run main/othervm/timeout=1200 * -XX:-UseGCOverheadLimit * -Xlog:gc* * gc.gctests.LargeObjects.large001.large001 diff --git a/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large002/TestDescription.java index c96b47cf1cd..c207b80c059 100644 --- a/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -60,7 +60,7 @@ * @comment generate and compile nsk.share.gc.newclass.* classes * @run driver nsk.share.gc.GenClassesBuilder * - * @run main/othervm/timeout=300 + * @run main/othervm/timeout=1200 * -XX:-UseGCOverheadLimit * gc.gctests.LargeObjects.large001.large001 * -largeClassesPath classes diff --git a/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large003/TestDescription.java index adfa8879153..fd7e1e5e8dd 100644 --- a/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -64,7 +64,7 @@ * @comment generate and compile nsk.share.gc.newclass.* classes * @run driver nsk.share.gc.GenClassesBuilder * - * @run main/othervm/timeout=300 + * @run main/othervm/timeout=1200 * -XX:-UseGCOverheadLimit * gc.gctests.LargeObjects.large001.large001 * -largeClassesPath classes diff --git a/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large004/TestDescription.java index 7b09a18d798..2301daba8d3 100644 --- a/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -64,7 +64,7 @@ * @comment generate and compile nsk.share.gc.newclass.* classes * @run driver nsk.share.gc.GenClassesBuilder * - * @run main/othervm/timeout=300 + * @run main/othervm/timeout=1200 * -XX:-UseGCOverheadLimit * gc.gctests.LargeObjects.large001.large001 * -largeClassesPath classes diff --git a/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large005/TestDescription.java index d2943ff90ab..abf91f48dea 100644 --- a/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large005/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -64,7 +64,7 @@ * @comment generate and compile nsk.share.gc.newclass.* classes * @run driver nsk.share.gc.GenClassesBuilder * - * @run main/othervm/timeout=300 + * @run main/othervm/timeout=1200 * -XX:-UseGCOverheadLimit * gc.gctests.LargeObjects.large001.large001 * -largeClassesPath classes diff --git a/test/hotspot/jtreg/vmTestbase/gc/gctests/SoftReference/soft004/soft004.java b/test/hotspot/jtreg/vmTestbase/gc/gctests/SoftReference/soft004/soft004.java index ba9b6d75750..f57e0888268 100644 --- a/test/hotspot/jtreg/vmTestbase/gc/gctests/SoftReference/soft004/soft004.java +++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/SoftReference/soft004/soft004.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -32,7 +32,7 @@ * /test/lib * @build jdk.test.whitebox.WhiteBox * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox - * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI gc.gctests.SoftReference.soft004.soft004 -t 1 + * @run main/othervm/timeout=480 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI gc.gctests.SoftReference.soft004.soft004 -t 1 */ package gc.gctests.SoftReference.soft004; diff --git a/test/hotspot/jtreg/vmTestbase/gc/gctests/WeakReference/weak004/weak004.java b/test/hotspot/jtreg/vmTestbase/gc/gctests/WeakReference/weak004/weak004.java index bf86f5d8045..29390ae02d5 100644 --- a/test/hotspot/jtreg/vmTestbase/gc/gctests/WeakReference/weak004/weak004.java +++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/WeakReference/weak004/weak004.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -32,7 +32,7 @@ * /test/lib * @build jdk.test.whitebox.WhiteBox * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox - * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI gc.gctests.WeakReference.weak004.weak004 -t 1 + * @run main/othervm/timeout=480 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI gc.gctests.WeakReference.weak004.weak004 -t 1 */ package gc.gctests.WeakReference.weak004; diff --git a/test/hotspot/jtreg/vmTestbase/gc/vector/CircularListLow/TestDescription.java b/test/hotspot/jtreg/vmTestbase/gc/vector/CircularListLow/TestDescription.java index 2e4cfcb9992..68fe6779e99 100644 --- a/test/hotspot/jtreg/vmTestbase/gc/vector/CircularListLow/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/gc/vector/CircularListLow/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -31,5 +31,5 @@ * * @library /vmTestbase * /test/lib - * @run main/othervm gc.vector.SimpleGC.SimpleGC -ms low -gp circularList(low) + * @run main/othervm/timeout=480 gc.vector.SimpleGC.SimpleGC -ms low -gp circularList(low) */ diff --git a/test/hotspot/jtreg/vmTestbase/jit/escape/AdaptiveBlocking/AdaptiveBlocking001/AdaptiveBlocking001.java b/test/hotspot/jtreg/vmTestbase/jit/escape/AdaptiveBlocking/AdaptiveBlocking001/AdaptiveBlocking001.java index e2d04c6745a..17e88aeebb0 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/escape/AdaptiveBlocking/AdaptiveBlocking001/AdaptiveBlocking001.java +++ b/test/hotspot/jtreg/vmTestbase/jit/escape/AdaptiveBlocking/AdaptiveBlocking001/AdaptiveBlocking001.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -37,7 +37,7 @@ * @library /vmTestbase * /test/lib * @build jit.escape.AdaptiveBlocking.AdaptiveBlocking001.AdaptiveBlocking001 - * @run driver/timeout=300 ExecDriver --java -server -Xcomp -XX:+DoEscapeAnalysis + * @run driver/timeout=1200 ExecDriver --java -server -Xcomp -XX:+DoEscapeAnalysis * jit.escape.AdaptiveBlocking.AdaptiveBlocking001.AdaptiveBlocking001 -numRounds 10 */ diff --git a/test/hotspot/jtreg/vmTestbase/metaspace/shrink_grow/CompressedClassSpaceSize/TestDescription.java b/test/hotspot/jtreg/vmTestbase/metaspace/shrink_grow/CompressedClassSpaceSize/TestDescription.java index 577bb5f1a92..3fb8241191d 100644 --- a/test/hotspot/jtreg/vmTestbase/metaspace/shrink_grow/CompressedClassSpaceSize/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/metaspace/shrink_grow/CompressedClassSpaceSize/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -31,11 +31,10 @@ * * @requires vm.opt.final.ClassUnloading * @library /vmTestbase /test/lib - * @run main/othervm + * @run main/othervm/timeout=480 * -DrequiresCompressedClassSpace=true * -XX:MaxMetaspaceSize=100m * -XX:CompressedClassSpaceSize=10m * -Xlog:gc*:gc.log * metaspace.shrink_grow.ShrinkGrowTest.ShrinkGrowTest */ - diff --git a/test/hotspot/jtreg/vmTestbase/metaspace/shrink_grow/ShrinkGrowMultiJVM/ShrinkGrowMultiJVM.java b/test/hotspot/jtreg/vmTestbase/metaspace/shrink_grow/ShrinkGrowMultiJVM/ShrinkGrowMultiJVM.java index c59f8cd9e9e..dc7881dc8f7 100644 --- a/test/hotspot/jtreg/vmTestbase/metaspace/shrink_grow/ShrinkGrowMultiJVM/ShrinkGrowMultiJVM.java +++ b/test/hotspot/jtreg/vmTestbase/metaspace/shrink_grow/ShrinkGrowMultiJVM/ShrinkGrowMultiJVM.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -31,7 +31,7 @@ * @requires vm.opt.final.ClassUnloading * @library /vmTestbase /test/lib * @build metaspace.shrink_grow.ShrinkGrowMultiJVM.ShrinkGrowMultiJVM - * @run driver metaspace.shrink_grow.ShrinkGrowMultiJVM.ShrinkGrowMultiJVM + * @run driver/timeout=480 metaspace.shrink_grow.ShrinkGrowMultiJVM.ShrinkGrowMultiJVM */ package metaspace.shrink_grow.ShrinkGrowMultiJVM; diff --git a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy001/TestDescription.java index 32f5c0c55e8..2b4082d215f 100644 --- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -33,7 +33,7 @@ * @library /vmTestbase /test/lib * @build jdk.test.whitebox.WhiteBox * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox - * @run main/othervm + * @run main/othervm/timeout=480 * -Xss10m * -Xbootclasspath/a:. * -XX:+UnlockDiagnosticVMOptions diff --git a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy002/TestDescription.java index 75faa8d14e3..e936c3fe73e 100644 --- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -33,7 +33,7 @@ * @library /vmTestbase /test/lib * @build jdk.test.whitebox.WhiteBox * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox - * @run main/othervm + * @run main/othervm/timeout=480 * -Xss10m * -Xbootclasspath/a:. * -XX:+UnlockDiagnosticVMOptions diff --git a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy003/TestDescription.java index 743de7b4e7d..48fa6fe5392 100644 --- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -33,7 +33,7 @@ * @library /vmTestbase /test/lib * @build jdk.test.whitebox.WhiteBox * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox - * @run main/othervm + * @run main/othervm/timeout=480 * -Xss10m * -Xbootclasspath/a:. * -XX:+UnlockDiagnosticVMOptions diff --git a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy004/TestDescription.java index bc6287eaf60..ada43b47c59 100644 --- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -33,7 +33,7 @@ * @library /vmTestbase /test/lib * @build jdk.test.whitebox.WhiteBox * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox - * @run main/othervm + * @run main/othervm/timeout=480 * -Xss10m * -Xbootclasspath/a:. * -XX:+UnlockDiagnosticVMOptions diff --git a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy005/TestDescription.java index 030f07fbaea..e66673d3316 100644 --- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy005/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -33,7 +33,7 @@ * @library /vmTestbase /test/lib * @build jdk.test.whitebox.WhiteBox * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox - * @run main/othervm + * @run main/othervm/timeout=480 * -Xss10m * -Xbootclasspath/a:. * -XX:+UnlockDiagnosticVMOptions diff --git a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy006/TestDescription.java index f294a4ecc6a..288ea9d2105 100644 --- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy006/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -33,7 +33,7 @@ * @library /vmTestbase /test/lib * @build jdk.test.whitebox.WhiteBox * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox - * @run main/othervm + * @run main/othervm/timeout=480 * -Xss10m * -Xbootclasspath/a:. * -XX:+UnlockDiagnosticVMOptions diff --git a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy007/TestDescription.java index f3238d787c2..651da5c2955 100644 --- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy007/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy007/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -35,7 +35,7 @@ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox * @comment generate and compile metaspace.stressHierarchy.common.HumongousClass * @run driver metaspace.stressHierarchy.common.GenClassesBuilder - * @run main/othervm + * @run main/othervm/timeout=480 * -XX:MaxMetaspaceSize=450m * -Xss10m * -Xbootclasspath/a:. diff --git a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy008/TestDescription.java b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy008/TestDescription.java index a37231429c3..03b8f77cfaf 100644 --- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy008/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy008/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -35,7 +35,7 @@ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox * @comment generate and compile metaspace.stressHierarchy.common.HumongousClass * @run driver metaspace.stressHierarchy.common.GenClassesBuilder - * @run main/othervm + * @run main/othervm/timeout=480 * -XX:MaxMetaspaceSize=450m * -Xss10m * -Xbootclasspath/a:. diff --git a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy009/TestDescription.java b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy009/TestDescription.java index dd28f1665a7..247abdfaa3d 100644 --- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy009/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy009/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -35,7 +35,7 @@ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox * @comment generate and compile metaspace.stressHierarchy.common.HumongousClass * @run driver metaspace.stressHierarchy.common.GenClassesBuilder - * @run main/othervm + * @run main/othervm/timeout=480 * -XX:MaxMetaspaceSize=450m * -Xss10m * -Xbootclasspath/a:. diff --git a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy010/TestDescription.java b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy010/TestDescription.java index ab11ba48647..2c9acbbbf01 100644 --- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy010/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy010/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -35,7 +35,7 @@ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox * @comment generate and compile metaspace.stressHierarchy.common.HumongousClass * @run driver metaspace.stressHierarchy.common.GenClassesBuilder - * @run main/othervm + * @run main/othervm/timeout=480 * -XX:MaxMetaspaceSize=450m * -Xss10m * -Xbootclasspath/a:. diff --git a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy011/TestDescription.java b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy011/TestDescription.java index ce304df4041..755869c92d2 100644 --- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy011/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy011/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -35,7 +35,7 @@ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox * @comment generate and compile metaspace.stressHierarchy.common.HumongousClass * @run driver metaspace.stressHierarchy.common.GenClassesBuilder - * @run main/othervm + * @run main/othervm/timeout=480 * -XX:MaxMetaspaceSize=450m * -Xss10m * -Xbootclasspath/a:. diff --git a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy012/TestDescription.java b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy012/TestDescription.java index a37eda53cfa..71a61a92ede 100644 --- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy012/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy012/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -35,7 +35,7 @@ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox * @comment generate and compile metaspace.stressHierarchy.common.HumongousClass * @run driver metaspace.stressHierarchy.common.GenClassesBuilder - * @run main/othervm + * @run main/othervm/timeout=480 * -XX:MaxMetaspaceSize=250m * -Xss10m * -Xbootclasspath/a:. diff --git a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy013/TestDescription.java b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy013/TestDescription.java index a10d9b2d50b..c9cf9ee88cb 100644 --- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy013/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy013/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -33,7 +33,7 @@ * @library /vmTestbase /test/lib * @build jdk.test.whitebox.WhiteBox * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox - * @run main/othervm + * @run main/othervm/timeout=480 * -Xss10m * -Xbootclasspath/a:. * -XX:+UnlockDiagnosticVMOptions diff --git a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy014/TestDescription.java b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy014/TestDescription.java index c0ceceb1e50..181a526e97f 100644 --- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy014/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy014/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -33,7 +33,7 @@ * @library /vmTestbase /test/lib * @build jdk.test.whitebox.WhiteBox * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox - * @run main/othervm + * @run main/othervm/timeout=480 * -Xss10m * -Xbootclasspath/a:. * -XX:+UnlockDiagnosticVMOptions diff --git a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy015/TestDescription.java b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy015/TestDescription.java index a0c73e6dd0c..11eba8b2b1f 100644 --- a/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy015/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/metaspace/stressHierarchy/stressHierarchy015/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -33,7 +33,7 @@ * @library /vmTestbase /test/lib * @build jdk.test.whitebox.WhiteBox * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox - * @run main/othervm + * @run main/othervm/timeout=480 * -Xss10m * -Xbootclasspath/a:. * -XX:+UnlockDiagnosticVMOptions diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects001/referringObjects001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects001/referringObjects001.java index 7e73bace342..b5ea8c34cbd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects001/referringObjects001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects001/referringObjects001.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -57,7 +57,7 @@ * /test/lib * @build nsk.jdi.ObjectReference.referringObjects.referringObjects001.referringObjects001 * nsk.share.jdi.TestClass1 - * @run main/othervm/native + * @run main/othervm/native/timeout=480 * nsk.jdi.ObjectReference.referringObjects.referringObjects001.referringObjects001 * -verbose * -arch=${os.family}-${os.simpleArch} diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepEvent004/stepEvent004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepEvent004/stepEvent004.java index ff303d4c52d..14c0ebf74f5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepEvent004/stepEvent004.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepEvent004/stepEvent004.java @@ -62,7 +62,7 @@ * @library /vmTestbase * /test/lib * @build nsk.jdi.StepEvent._itself_.stepEvent004.stepEvent004 - * @run driver + * @run driver/timeout=480 * nsk.jdi.StepEvent._itself_.stepEvent004.stepEvent004 * -verbose * -arch=${os.family}-${os.simpleArch} diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathEvent/thread/thread001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathEvent/thread/thread001/TestDescription.java index b638a58976f..269aaec8226 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathEvent/thread/thread001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathEvent/thread/thread001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -82,7 +82,7 @@ * /test/lib * @build nsk.jdi.ThreadDeathEvent.thread.thread001 * nsk.jdi.ThreadDeathEvent.thread.thread001a - * @run driver + * @run driver/timeout=480 * nsk.jdi.ThreadDeathEvent.thread.thread001 * -verbose * -arch=${os.family}-${os.simpleArch} @@ -91,4 +91,3 @@ * -transport.address=dynamic * -debugee.vmkeys="${test.vm.opts} ${test.java.opts}" */ - diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/mixed002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/mixed002/TestDescription.java index 938673e2284..e5d77e0263b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/mixed002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/mixed002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -63,7 +63,7 @@ * nsk.share.jdi.MonitorEventsDebuggee * * @build nsk.share.jdi.SerialExecutionDebugger - * @run main/othervm/native + * @run main/othervm/native/timeout=480 * nsk.share.jdi.SerialExecutionDebugger * -verbose * -arch=${os.family}-${os.simpleArch} @@ -76,4 +76,3 @@ * -configFile ${test.src}/mixed002.tests * -testWorkDir . */ - diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/HoldEvents/holdevents002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/HoldEvents/holdevents002/TestDescription.java index e41efd46bb4..32cf223dda7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/HoldEvents/holdevents002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/VirtualMachine/HoldEvents/holdevents002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -53,7 +53,7 @@ * @library /vmTestbase /test/hotspot/jtreg/vmTestbase * /test/lib * @build nsk.jdwp.VirtualMachine.HoldEvents.holdevents002a - * @run main/othervm/timeout=420 + * @run main/othervm/timeout=1680 * nsk.jdwp.VirtualMachine.HoldEvents.holdevents002 * -arch=${os.family}-${os.simpleArch} * -verbose @@ -62,4 +62,3 @@ * -transport.address=dynamic * -debugee.vmkeys="${test.vm.opts} ${test.java.opts}" */ - diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait001/TestDescription.java index 7705260e802..93b59229f14 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -37,6 +37,5 @@ * * @library /vmTestbase * /test/lib - * @run main/othervm/native -agentlib:rawmnwait001 nsk.jvmti.RawMonitorWait.rawmnwait001 + * @run main/othervm/native/timeout=480 -agentlib:rawmnwait001 nsk.jvmti.RawMonitorWait.rawmnwait001 */ - diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP03/sp03t001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP03/sp03t001/TestDescription.java index 9c5f23d0c43..cf472a079c2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP03/sp03t001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP03/sp03t001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -59,8 +59,7 @@ * @build nsk.jvmti.scenarios.sampling.SP03.sp03t001 * @comment see JDK-8243962 for background on requires expression * @requires !(vm.flightRecorder & vm.debug & os.family == "windows") - * @run main/othervm/native + * @run main/othervm/native/timeout=480 * -agentlib:sp03t001=-waittime=5,threads=10 * nsk.jvmti.scenarios.sampling.SP03.sp03t001 */ - diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP03/sp03t002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP03/sp03t002/TestDescription.java index ba4d3f332ce..7c9f0773788 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP03/sp03t002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP03/sp03t002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -59,8 +59,7 @@ * @build nsk.jvmti.scenarios.sampling.SP03.sp03t002 * @comment see JDK-8243962 for background on requires expression * @requires !(vm.flightRecorder & vm.debug & os.family == "windows") - * @run main/othervm/native + * @run main/othervm/native/timeout=480 * -agentlib:sp03t002=-waittime=5,threads=10 * nsk.jvmti.scenarios.sampling.SP03.sp03t002 */ - diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP04/sp04t001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP04/sp04t001/TestDescription.java index 730cfa104e5..dbb8f30873f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP04/sp04t001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP04/sp04t001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -58,8 +58,7 @@ * /test/lib * @comment see JDK-8243962 for background on requires expression * @requires !(vm.flightRecorder & vm.debug & os.family == "windows") - * @run main/othervm/native + * @run main/othervm/native/timeout=480 * -agentlib:sp04t001=-waittime=5,threads=10 * nsk.jvmti.scenarios.sampling.SP04.sp04t001 */ - diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP04/sp04t002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP04/sp04t002/TestDescription.java index e03a343e381..da08316bfd2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP04/sp04t002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP04/sp04t002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -58,8 +58,7 @@ * /test/lib * @comment see JDK-8243962 for background on requires expression * @requires !(vm.flightRecorder & vm.debug & os.family == "windows") - * @run main/othervm/native + * @run main/othervm/native/timeout=480 * -agentlib:sp04t002=-waittime=5,threads=10 * nsk.jvmti.scenarios.sampling.SP04.sp04t002 */ - diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP07/sp07t001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP07/sp07t001/TestDescription.java index 79ccb9c8e70..182cf4494ff 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP07/sp07t001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP07/sp07t001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -38,8 +38,7 @@ * * @library /vmTestbase * /test/lib - * @run main/othervm/native + * @run main/othervm/native/timeout=480 * -agentlib:sp07t001=-waittime=5 * nsk.jvmti.scenarios.sampling.SP07.sp07t001 */ - diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/ThreadInfo/isSuspended/issuspended002.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/ThreadInfo/isSuspended/issuspended002.java index 411d70f6e91..e8b855b5ce6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/ThreadInfo/isSuspended/issuspended002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/ThreadInfo/isSuspended/issuspended002.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -37,7 +37,7 @@ * @library /vmTestbase * /test/lib * /testlibrary - * @run main/othervm nsk.monitoring.ThreadInfo.isSuspended.issuspended002 + * @run main/othervm/timeout=480 nsk.monitoring.ThreadInfo.isSuspended.issuspended002 */ package nsk.monitoring.ThreadInfo.isSuspended; diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/thread/strace001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/thread/strace001/TestDescription.java index 53b73954af5..5732f319bc9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/thread/strace001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/thread/strace001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -60,6 +60,5 @@ * * @library /vmTestbase * /test/lib - * @run main/othervm/native nsk.monitoring.stress.thread.strace001 -threadCount=50 -depth=200 + * @run main/othervm/native/timeout=480 nsk.monitoring.stress.thread.strace001 -threadCount=50 -depth=200 */ - diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/thread/strace002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/thread/strace002/TestDescription.java index b41fb5f76f8..6548e27c779 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/thread/strace002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/thread/strace002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -58,10 +58,9 @@ * * @library /vmTestbase * /test/lib - * @run main/othervm/native + * @run main/othervm/native/timeout=480 * nsk.monitoring.stress.thread.strace001 * -testMode=server * -threadCount=50 * -depth=200 */ - diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/thread/strace003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/thread/strace003/TestDescription.java index c39f4dde2af..fc0174092e0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/thread/strace003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/thread/strace003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -58,11 +58,10 @@ * * @library /vmTestbase * /test/lib - * @run main/othervm/native + * @run main/othervm/native/timeout=480 * nsk.monitoring.stress.thread.strace001 * -testMode=server * -MBeanServer=custom * -threadCount=50 * -depth=200 */ - diff --git a/test/hotspot/jtreg/vmTestbase/nsk/stress/strace/strace006.java b/test/hotspot/jtreg/vmTestbase/nsk/stress/strace/strace006.java index ef27aa57bfa..accfae7e4bd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/stress/strace/strace006.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/strace/strace006.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -43,7 +43,7 @@ * * @library /vmTestbase * /test/lib - * @run main/othervm/native nsk.stress.strace.strace006 + * @run main/othervm/native/timeout=480 nsk.stress.strace.strace006 */ package nsk.stress.strace; diff --git a/test/hotspot/jtreg/vmTestbase/nsk/stress/thread/thread001.java b/test/hotspot/jtreg/vmTestbase/nsk/stress/thread/thread001.java index 4fdab351c79..a047824ffbb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/stress/thread/thread001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/thread/thread001.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -33,7 +33,7 @@ * lower than the main thread. * * @library /test/lib - * @run main/othervm nsk.stress.thread.thread001 500 2m 5s + * @run main/othervm/timeout=480 nsk.stress.thread.thread001 500 2m 5s */ package nsk.stress.thread; diff --git a/test/hotspot/jtreg/vmTestbase/nsk/stress/thread/thread002.java b/test/hotspot/jtreg/vmTestbase/nsk/stress/thread/thread002.java index a574533581f..f4d48b9eaa7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/stress/thread/thread002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/thread/thread002.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -32,7 +32,7 @@ * Try to start the given number of threads of the same * priority that the main thread. * - * @run main/othervm nsk.stress.thread.thread002 500 2m 5s + * @run main/othervm/timeout=480 nsk.stress.thread.thread002 500 2m 5s */ package nsk.stress.thread; diff --git a/test/hotspot/jtreg/vmTestbase/nsk/stress/thread/thread005.java b/test/hotspot/jtreg/vmTestbase/nsk/stress/thread/thread005.java index 0a5e33441cb..06afa1d2154 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/stress/thread/thread005.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/thread/thread005.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -31,7 +31,7 @@ * DESCRIPTION * Try many threads starting simultaneously. * - * @run main/othervm nsk.stress.thread.thread005 500 2m 5s + * @run main/othervm/timeout=480 nsk.stress.thread.thread005 500 2m 5s */ package nsk.stress.thread; diff --git a/test/hotspot/jtreg/vmTestbase/nsk/stress/thread/thread006.java b/test/hotspot/jtreg/vmTestbase/nsk/stress/thread/thread006.java index 6adda1929d2..b6e5115e153 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/stress/thread/thread006.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/thread/thread006.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -32,7 +32,7 @@ * Try many threads of lower priority * starting simultaneously. * - * @run main/othervm nsk.stress.thread.thread006 500 2m 5s + * @run main/othervm/timeout=480 nsk.stress.thread.thread006 500 2m 5s */ package nsk.stress.thread; diff --git a/test/hotspot/jtreg/vmTestbase/nsk/stress/thread/thread007.java b/test/hotspot/jtreg/vmTestbase/nsk/stress/thread/thread007.java index 26388c28d0a..04b3784ce11 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/stress/thread/thread007.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/thread/thread007.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -32,7 +32,7 @@ * Try to start the given number of threads starting simultaneously * when notifyall() is signaled at the stopLine object. * - * @run main/othervm/timeout=300 nsk.stress.thread.thread007 500 2m 5s + * @run main/othervm/timeout=1200 nsk.stress.thread.thread007 500 2m 5s */ package nsk.stress.thread; diff --git a/test/hotspot/jtreg/vmTestbase/nsk/stress/thread/thread008.java b/test/hotspot/jtreg/vmTestbase/nsk/stress/thread/thread008.java index 2cbc198a693..a6a64bc9ce9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/stress/thread/thread008.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/thread/thread008.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -33,7 +33,7 @@ * starting simultaneously when notifyall() is signaled at the * stopLine object. * - * @run main/othervm/timeout=300 nsk.stress.thread.thread008 500 2m 5s + * @run main/othervm/timeout=1200 nsk.stress.thread.thread008 500 2m 5s */ package nsk.stress.thread; diff --git a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree001/btree001.java b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree001/btree001.java index db6ebf0a446..d00b965cce2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree001/btree001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree001/btree001.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -40,14 +40,13 @@ * @comment btree classes import nsk.sysdict.share.* * @build nsk.sysdict.share.* * @comment build btree.jar - * @run driver nsk.sysdict.share.GenClassesBuilder btree + * @run driver/timeout=480 nsk.sysdict.share.GenClassesBuilder btree * @comment build fats.jar - * @run driver nsk.sysdict.share.GenClassesBuilder fats + * @run driver/timeout=480 nsk.sysdict.share.GenClassesBuilder fats * @build nsk.sysdict.share.BTreeTest - * @run main/othervm + * @run main/othervm/timeout=480 * -XX:-UseGCOverheadLimit * nsk.sysdict.share.BTreeTest * -jarpath btree.jar${path.separator}fats.jar * -t 1 */ - diff --git a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree002/btree002.java b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree002/btree002.java index 5a4a9fae0d6..e2b161f6f47 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree002/btree002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree002/btree002.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -39,15 +39,14 @@ * @comment btree classes import nsk.sysdict.share.* * @build nsk.sysdict.share.* * @comment build btree.jar - * @run driver nsk.sysdict.share.GenClassesBuilder btree + * @run driver/timeout=480 nsk.sysdict.share.GenClassesBuilder btree * @comment build fats.jar - * @run driver nsk.sysdict.share.GenClassesBuilder fats + * @run driver/timeout=480 nsk.sysdict.share.GenClassesBuilder fats * @build nsk.sysdict.share.BTreeTest - * @run main/othervm + * @run main/othervm/timeout=480 * -XX:-UseGCOverheadLimit * nsk.sysdict.share.BTreeTest * -jarpath btree.jar${path.separator}fats.jar * -useSingleLoader * -t 1 */ - diff --git a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree003/btree003.java b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree003/btree003.java index b915e0d716c..7fedad20e90 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree003/btree003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree003/btree003.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -39,15 +39,14 @@ * @comment btree classes import nsk.sysdict.share.* * @build nsk.sysdict.share.* * @comment build btree.jar - * @run driver nsk.sysdict.share.GenClassesBuilder btree + * @run driver/timeout=480 nsk.sysdict.share.GenClassesBuilder btree * @comment build fats.jar - * @run driver nsk.sysdict.share.GenClassesBuilder fats + * @run driver/timeout=480 nsk.sysdict.share.GenClassesBuilder fats * @build nsk.sysdict.share.BTreeTest - * @run main/othervm + * @run main/othervm/timeout=480 * -XX:-UseGCOverheadLimit * nsk.sysdict.share.BTreeTest * -jarpath btree.jar${path.separator}fats.jar * -t 1 * -useFatClass */ - diff --git a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree004/btree004.java b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree004/btree004.java index 14094d6a5a1..dc8170c80e9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree004/btree004.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree004/btree004.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -40,13 +40,12 @@ * @comment btree classes import nsk.sysdict.share.* * @build nsk.sysdict.share.* * @comment build btree.jar - * @run driver nsk.sysdict.share.GenClassesBuilder btree + * @run driver/timeout=480 nsk.sysdict.share.GenClassesBuilder btree * @comment build fats.jar - * @run driver nsk.sysdict.share.GenClassesBuilder fats + * @run driver/timeout=480 nsk.sysdict.share.GenClassesBuilder fats * @build nsk.sysdict.share.BTreeTest - * @run main/othervm + * @run main/othervm/timeout=480 * -XX:-UseGCOverheadLimit * nsk.sysdict.share.BTreeTest * -jarpath btree.jar${path.separator}fats.jar */ - diff --git a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree005/btree005.java b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree005/btree005.java index 42041c94fcf..55b20419d17 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree005/btree005.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree005/btree005.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -39,14 +39,13 @@ * @comment btree classes import nsk.sysdict.share.* * @build nsk.sysdict.share.* * @comment build btree.jar - * @run driver nsk.sysdict.share.GenClassesBuilder btree + * @run driver/timeout=480 nsk.sysdict.share.GenClassesBuilder btree * @comment build fats.jar - * @run driver nsk.sysdict.share.GenClassesBuilder fats + * @run driver/timeout=480 nsk.sysdict.share.GenClassesBuilder fats * @build nsk.sysdict.share.BTreeTest - * @run main/othervm + * @run main/othervm/timeout=480 * -XX:-UseGCOverheadLimit * nsk.sysdict.share.BTreeTest * -jarpath btree.jar${path.separator}fats.jar * -useSingleLoader */ - diff --git a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree006/btree006.java b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree006/btree006.java index 49b55e39456..ed15893686f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree006/btree006.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree006/btree006.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -39,14 +39,13 @@ * @comment btree classes import nsk.sysdict.share.* * @build nsk.sysdict.share.* * @comment build btree.jar - * @run driver nsk.sysdict.share.GenClassesBuilder btree + * @run driver/timeout=480 nsk.sysdict.share.GenClassesBuilder btree * @comment build fats.jar - * @run driver nsk.sysdict.share.GenClassesBuilder fats + * @run driver/timeout=480 nsk.sysdict.share.GenClassesBuilder fats * @build nsk.sysdict.share.BTreeTest - * @run main/othervm + * @run main/othervm/timeout=480 * -XX:-UseGCOverheadLimit * nsk.sysdict.share.BTreeTest * -jarpath btree.jar${path.separator}fats.jar * -useFatClass */ - diff --git a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree007/btree007.java b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree007/btree007.java index 6c74967dd22..dd58953d323 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree007/btree007.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree007/btree007.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -42,15 +42,14 @@ * @comment btree classes import nsk.sysdict.share.* * @build nsk.sysdict.share.* * @comment build btree.jar - * @run driver nsk.sysdict.share.GenClassesBuilder btree + * @run driver/timeout=480 nsk.sysdict.share.GenClassesBuilder btree * @comment build fats.jar - * @run driver nsk.sysdict.share.GenClassesBuilder fats + * @run driver/timeout=480 nsk.sysdict.share.GenClassesBuilder fats * @build nsk.sysdict.share.BTreeTest - * @run main/othervm + * @run main/othervm/timeout=480 * -XX:-UseGCOverheadLimit * nsk.sysdict.share.BTreeTest * -jarpath btree.jar${path.separator}fats.jar * -t 1 * -stressHeap */ - diff --git a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree008/btree008.java b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree008/btree008.java index 9861f3c051f..a0dff733054 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree008/btree008.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree008/btree008.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -41,11 +41,11 @@ * @comment btree classes import nsk.sysdict.share.* * @build nsk.sysdict.share.* * @comment build btree.jar - * @run driver nsk.sysdict.share.GenClassesBuilder btree + * @run driver/timeout=480 nsk.sysdict.share.GenClassesBuilder btree * @comment build fats.jar - * @run driver nsk.sysdict.share.GenClassesBuilder fats + * @run driver/timeout=480 nsk.sysdict.share.GenClassesBuilder fats * @build nsk.sysdict.share.BTreeTest - * @run main/othervm + * @run main/othervm/timeout=480 * -XX:-UseGCOverheadLimit * nsk.sysdict.share.BTreeTest * -jarpath btree.jar${path.separator}fats.jar @@ -53,4 +53,3 @@ * -stressHeap * -t 1 */ - diff --git a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree009/btree009.java b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree009/btree009.java index 273fceebb81..6f70b64178b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree009/btree009.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree009/btree009.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -41,11 +41,11 @@ * @comment btree classes import nsk.sysdict.share.* * @build nsk.sysdict.share.* * @comment build btree.jar - * @run driver nsk.sysdict.share.GenClassesBuilder btree + * @run driver/timeout=480 nsk.sysdict.share.GenClassesBuilder btree * @comment build fats.jar - * @run driver nsk.sysdict.share.GenClassesBuilder fats + * @run driver/timeout=480 nsk.sysdict.share.GenClassesBuilder fats * @build nsk.sysdict.share.BTreeTest - * @run main/othervm + * @run main/othervm/timeout=480 * -XX:-UseGCOverheadLimit * nsk.sysdict.share.BTreeTest * -jarpath btree.jar${path.separator}fats.jar @@ -53,4 +53,3 @@ * -stressHeap * -useFatClass */ - diff --git a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree010/btree010.java b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree010/btree010.java index 1e9f3e8813f..27d6166776b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree010/btree010.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree010/btree010.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -42,14 +42,13 @@ * @comment btree classes import nsk.sysdict.share.* * @build nsk.sysdict.share.* * @comment build btree.jar - * @run driver nsk.sysdict.share.GenClassesBuilder btree + * @run driver/timeout=480 nsk.sysdict.share.GenClassesBuilder btree * @comment build fats.jar - * @run driver nsk.sysdict.share.GenClassesBuilder fats + * @run driver/timeout=480 nsk.sysdict.share.GenClassesBuilder fats * @build nsk.sysdict.share.BTreeTest - * @run main/othervm + * @run main/othervm/timeout=480 * -XX:-UseGCOverheadLimit * nsk.sysdict.share.BTreeTest * -jarpath btree.jar${path.separator}fats.jar * -stressHeap */ - diff --git a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree011/btree011.java b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree011/btree011.java index 507abcef278..0a46ed3d80c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree011/btree011.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree011/btree011.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -41,15 +41,14 @@ * @comment btree classes import nsk.sysdict.share.* * @build nsk.sysdict.share.* * @comment build btree.jar - * @run driver nsk.sysdict.share.GenClassesBuilder btree + * @run driver/timeout=480 nsk.sysdict.share.GenClassesBuilder btree * @comment build fats.jar - * @run driver nsk.sysdict.share.GenClassesBuilder fats + * @run driver/timeout=480 nsk.sysdict.share.GenClassesBuilder fats * @build nsk.sysdict.share.BTreeTest - * @run main/othervm + * @run main/othervm/timeout=480 * -XX:-UseGCOverheadLimit * nsk.sysdict.share.BTreeTest * -jarpath btree.jar${path.separator}fats.jar * -useSingleLoader * -stressHeap */ - diff --git a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree012/btree012.java b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree012/btree012.java index 45ce9150457..cdc22cbb399 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree012/btree012.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree012/btree012.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -41,15 +41,14 @@ * @comment btree classes import nsk.sysdict.share.* * @build nsk.sysdict.share.* * @comment build btree.jar - * @run driver nsk.sysdict.share.GenClassesBuilder btree + * @run driver/timeout=480 nsk.sysdict.share.GenClassesBuilder btree * @comment build fats.jar - * @run driver nsk.sysdict.share.GenClassesBuilder fats + * @run driver/timeout=480 nsk.sysdict.share.GenClassesBuilder fats * @build nsk.sysdict.share.BTreeTest - * @run main/othervm + * @run main/othervm/timeout=480 * -XX:-UseGCOverheadLimit * nsk.sysdict.share.BTreeTest * -jarpath btree.jar${path.separator}fats.jar * -stressHeap * -useFatClass */ - diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2manyDiff_a/TestDescription.java b/test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2manyDiff_a/TestDescription.java index 5afb841f141..e0be5f1adb5 100644 --- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2manyDiff_a/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2manyDiff_a/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -59,4 +59,3 @@ * vm.mlvm.indy.func.jvmti.share.IndyRedefineTest * -dummyClassName=vm.mlvm.indy.func.jvmti.mergeCP_indy2manyDiff_a.INDIFY_Dummy0 */ - diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/stress/compiler/i2c_c2i/Test.java b/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/stress/compiler/i2c_c2i/Test.java index 146db0dfa80..72212757a8e 100644 --- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/stress/compiler/i2c_c2i/Test.java +++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/stress/compiler/i2c_c2i/Test.java @@ -50,7 +50,7 @@ * @build vm.mlvm.meth.stress.compiler.i2c_c2i.Test * @run driver vm.mlvm.share.IndifiedClassesBuilder * - * @run main/othervm -XX:CompileCommand=MemLimit,*.*,0 vm.mlvm.meth.stress.compiler.i2c_c2i.Test + * @run main/othervm/timeout=480 -XX:CompileCommand=MemLimit,*.*,0 vm.mlvm.meth.stress.compiler.i2c_c2i.Test */ package vm.mlvm.meth.stress.compiler.i2c_c2i; diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/stress/compiler/sequences/Test.java b/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/stress/compiler/sequences/Test.java index 9a34a2b7b3d..daf5aa19609 100644 --- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/stress/compiler/sequences/Test.java +++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/stress/compiler/sequences/Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -41,7 +41,7 @@ * @build vm.mlvm.meth.stress.compiler.sequences.Test * @run driver vm.mlvm.share.IndifiedClassesBuilder * - * @run main/othervm + * @run main/othervm/timeout=480 * vm.mlvm.meth.stress.compiler.sequences.Test * -threadsPerCpu 1 * -threadsExtra 2 diff --git a/test/jdk/com/sun/crypto/provider/KeyFactory/TestProviderLeak.java b/test/jdk/com/sun/crypto/provider/KeyFactory/TestProviderLeak.java index b2122d5691b..3b817325bcf 100644 --- a/test/jdk/com/sun/crypto/provider/KeyFactory/TestProviderLeak.java +++ b/test/jdk/com/sun/crypto/provider/KeyFactory/TestProviderLeak.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -28,6 +28,7 @@ * @summary com.sun.crypto.provider.SunJCE instance leak using KRB5 and * LoginContext * @author Brad Wetmore + * @library /test/lib * * @run main/othervm -Xmx20m TestProviderLeak * @@ -47,6 +48,7 @@ import javax.crypto.spec.*; import java.util.*; import java.util.concurrent.*; import jdk.test.lib.security.SecurityUtils; +import jdk.test.lib.Utils; public class TestProviderLeak { private static final int MB = 1024 * 1024; @@ -59,9 +61,7 @@ public class TestProviderLeak { static { int timeout = 5; try { - double timeoutFactor = Double.parseDouble( - System.getProperty("test.timeout.factor", "1.0")); - timeout = (int) (timeout * timeoutFactor); + timeout = (int) (timeout * Utils.TIMEOUT_FACTOR); } catch (Exception e) { System.out.println("Warning: " + e); } diff --git a/test/jdk/com/sun/jdi/InterruptHangTest.java b/test/jdk/com/sun/jdi/InterruptHangTest.java index 5dcb5efef31..07af07e3c02 100644 --- a/test/jdk/com/sun/jdi/InterruptHangTest.java +++ b/test/jdk/com/sun/jdi/InterruptHangTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -24,12 +24,14 @@ import com.sun.jdi.*; import com.sun.jdi.event.*; import com.sun.jdi.request.*; +import jdk.test.lib.Utils; /** * @test * @bug 6459476 * @summary Test interrupting debuggee with single stepping enable * @author jjh + * @library /test/lib * * @run build TestScaffold VMConnection TargetListener TargetAdapter * @run compile -g InterruptHangTest.java @@ -284,8 +286,7 @@ public class InterruptHangTest extends TestScaffold { timerThread = new Thread("test timer") { public void run() { int mySteps = 0; - float timeoutFactor = Float.parseFloat(System.getProperty("test.timeout.factor", "1.0")); - long sleepSeconds = (long)(20 * timeoutFactor); + long sleepSeconds = (long)(20 * Utils.TIMEOUT_FACTOR); println("Timer watching for steps every " + sleepSeconds + " seconds"); while (true) { try { diff --git a/test/jdk/com/sun/jdi/MethodEntryExitEvents.java b/test/jdk/com/sun/jdi/MethodEntryExitEvents.java index abdb0ff7c75..075d2044240 100644 --- a/test/jdk/com/sun/jdi/MethodEntryExitEvents.java +++ b/test/jdk/com/sun/jdi/MethodEntryExitEvents.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -29,9 +29,9 @@ * * @run build TestScaffold VMConnection TargetListener TargetAdapter * @run compile -g MethodEntryExitEvents.java - * @run driver MethodEntryExitEvents SUSPEND_EVENT_THREAD MethodEntryExitEventsDebugee - * @run driver MethodEntryExitEvents SUSPEND_NONE MethodEntryExitEventsDebugee - * @run driver MethodEntryExitEvents SUSPEND_ALL MethodEntryExitEventsDebugee + * @run driver/timeout=480 MethodEntryExitEvents SUSPEND_EVENT_THREAD MethodEntryExitEventsDebugee + * @run driver/timeout=480 MethodEntryExitEvents SUSPEND_NONE MethodEntryExitEventsDebugee + * @run driver/timeout=480 MethodEntryExitEvents SUSPEND_ALL MethodEntryExitEventsDebugee */ import com.sun.jdi.*; import com.sun.jdi.event.*; diff --git a/test/jdk/com/sun/jdi/ThreadMemoryLeakTest.java b/test/jdk/com/sun/jdi/ThreadMemoryLeakTest.java index ef44829f1f7..59168a4de7e 100644 --- a/test/jdk/com/sun/jdi/ThreadMemoryLeakTest.java +++ b/test/jdk/com/sun/jdi/ThreadMemoryLeakTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -32,7 +32,7 @@ * @run build TestScaffold VMConnection TargetListener TargetAdapter * @run compile -g ThreadMemoryLeakTest.java * @comment run with -Xmx7m so any leak will quickly produce OOME - * @run main/othervm -Xmx7m ThreadMemoryLeakTest + * @run main/othervm/timeout=480 -Xmx7m ThreadMemoryLeakTest */ import com.sun.jdi.*; import com.sun.jdi.event.*; diff --git a/test/jdk/com/sun/jndi/ldap/LdapPoolTimeoutTest.java b/test/jdk/com/sun/jndi/ldap/LdapPoolTimeoutTest.java index 123c5120daf..294e0f5f1a8 100644 --- a/test/jdk/com/sun/jndi/ldap/LdapPoolTimeoutTest.java +++ b/test/jdk/com/sun/jndi/ldap/LdapPoolTimeoutTest.java @@ -27,7 +27,7 @@ * @summary Multi-threaded client timeout tests for ldap pool * @library /test/lib * lib/ - * @run testng/othervm LdapPoolTimeoutTest + * @run testng/othervm/timeout=480 LdapPoolTimeoutTest */ import org.testng.annotations.Test; @@ -144,4 +144,3 @@ public class LdapPoolTimeoutTest { } } - diff --git a/test/jdk/com/sun/nio/sctp/SctpChannel/Connect.java b/test/jdk/com/sun/nio/sctp/SctpChannel/Connect.java index fccc12a9f06..b73db200ee2 100644 --- a/test/jdk/com/sun/nio/sctp/SctpChannel/Connect.java +++ b/test/jdk/com/sun/nio/sctp/SctpChannel/Connect.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,6 +25,7 @@ * @bug 4927640 * @summary Tests the SCTP protocol implementation * @author chegar + * @run main/timeout=480 Connect */ import java.net.InetSocketAddress; diff --git a/test/jdk/com/sun/nio/sctp/SctpServerChannel/NonBlockingAccept.java b/test/jdk/com/sun/nio/sctp/SctpServerChannel/NonBlockingAccept.java index 49ba4d64b5b..6d62aa6c154 100644 --- a/test/jdk/com/sun/nio/sctp/SctpServerChannel/NonBlockingAccept.java +++ b/test/jdk/com/sun/nio/sctp/SctpServerChannel/NonBlockingAccept.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,6 +25,7 @@ * @bug 4927640 * @summary Tests the SCTP protocol implementation * @author chegar + * @run main/timeout=480 NonBlockingAccept */ import java.net.InetSocketAddress; diff --git a/test/jdk/java/awt/font/NumericShaper/MTTest.java b/test/jdk/java/awt/font/NumericShaper/MTTest.java index 08a218dfc0d..a152f552dd1 100644 --- a/test/jdk/java/awt/font/NumericShaper/MTTest.java +++ b/test/jdk/java/awt/font/NumericShaper/MTTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,7 +25,7 @@ * @test * @bug 6843181 6943963 * @summary Confirm that NumericShaper is thread-safe. - * @run main/timeout=300/othervm MTTest + * @run main/timeout=400/othervm MTTest */ import java.awt.font.NumericShaper; diff --git a/test/jdk/java/beans/XMLDecoder/8028054/TestMethodFinder.java b/test/jdk/java/beans/XMLDecoder/8028054/TestMethodFinder.java index 1f6dc09550c..dc3384a3572 100644 --- a/test/jdk/java/beans/XMLDecoder/8028054/TestMethodFinder.java +++ b/test/jdk/java/beans/XMLDecoder/8028054/TestMethodFinder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -35,7 +35,7 @@ import java.util.List; * @author Sergey Malenkov * @modules java.desktop/com.sun.beans.finder * @compile -XDignore.symbol.file TestMethodFinder.java - * @run main TestMethodFinder + * @run main/timeout=480 TestMethodFinder */ public class TestMethodFinder { diff --git a/test/jdk/java/foreign/StdLibTest.java b/test/jdk/java/foreign/StdLibTest.java index 7bb8a29b0c0..f1e35b53a39 100644 --- a/test/jdk/java/foreign/StdLibTest.java +++ b/test/jdk/java/foreign/StdLibTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,7 +23,7 @@ /* * @test - * @run testng/othervm --enable-native-access=ALL-UNNAMED StdLibTest + * @run testng/othervm/timeout=480 --enable-native-access=ALL-UNNAMED StdLibTest */ import java.lang.invoke.MethodHandle; diff --git a/test/jdk/java/foreign/TestAccessModes.java b/test/jdk/java/foreign/TestAccessModes.java index a721c87484d..e54d4f1ae9e 100644 --- a/test/jdk/java/foreign/TestAccessModes.java +++ b/test/jdk/java/foreign/TestAccessModes.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,10 +23,10 @@ /* * @test - * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=false -Xverify:all TestAccessModes - * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true -Xverify:all TestAccessModes - * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=false -Xverify:all TestAccessModes - * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true -Xverify:all TestAccessModes + * @run testng/othervm/timeout=480 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=false -Xverify:all TestAccessModes + * @run testng/othervm/timeout=480 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true -Xverify:all TestAccessModes + * @run testng/othervm/timeout=480 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=false -Xverify:all TestAccessModes + * @run testng/othervm/timeout=480 -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true -Xverify:all TestAccessModes */ import java.lang.foreign.*; diff --git a/test/jdk/java/foreign/TestBufferStackStress2.java b/test/jdk/java/foreign/TestBufferStackStress2.java index cefdbb725d1..402ce6bbe94 100644 --- a/test/jdk/java/foreign/TestBufferStackStress2.java +++ b/test/jdk/java/foreign/TestBufferStackStress2.java @@ -30,7 +30,7 @@ * @bug 8356114 8356658 * @modules java.base/jdk.internal.foreign * @build NativeTestHelper TestBufferStackStress2 - * @run junit TestBufferStackStress2 + * @run junit/timeout=480 TestBufferStackStress2 */ import jdk.internal.foreign.BufferStack; diff --git a/test/jdk/java/foreign/TestConcurrentClose.java b/test/jdk/java/foreign/TestConcurrentClose.java index 06dc7375cda..82bb2492acf 100644 --- a/test/jdk/java/foreign/TestConcurrentClose.java +++ b/test/jdk/java/foreign/TestConcurrentClose.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -31,7 +31,7 @@ * @build jdk.test.whitebox.WhiteBox * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox * - * @run testng/othervm + * @run testng/othervm/timeout=480 * -Xbootclasspath/a:. * -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI diff --git a/test/jdk/java/foreign/TestDeadlock.java b/test/jdk/java/foreign/TestDeadlock.java index 8511a01d2f5..f333727d4ce 100644 --- a/test/jdk/java/foreign/TestDeadlock.java +++ b/test/jdk/java/foreign/TestDeadlock.java @@ -23,7 +23,7 @@ /* * @test id=Arena_allocateFrom - * @run main/othervm/timeout=10 --enable-native-access=ALL-UNNAMED -Xlog:class+init TestDeadlock Arena + * @run main/othervm/timeout=60 --enable-native-access=ALL-UNNAMED -Xlog:class+init TestDeadlock Arena */ /* diff --git a/test/jdk/java/foreign/TestMismatch.java b/test/jdk/java/foreign/TestMismatch.java index f50621e3415..fa01f1553eb 100644 --- a/test/jdk/java/foreign/TestMismatch.java +++ b/test/jdk/java/foreign/TestMismatch.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -24,7 +24,7 @@ /* * @test * @bug 8323552 - * @run testng TestMismatch + * @run testng/timeout=480 TestMismatch */ import java.lang.foreign.Arena; diff --git a/test/jdk/java/foreign/TestStringEncodingJumbo.java b/test/jdk/java/foreign/TestStringEncodingJumbo.java index 8ef86e72efc..bdae83bbd8b 100644 --- a/test/jdk/java/foreign/TestStringEncodingJumbo.java +++ b/test/jdk/java/foreign/TestStringEncodingJumbo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -42,7 +42,7 @@ import static org.testng.Assert.*; * @requires sun.arch.data.model == "64" * @requires vm.flavor != "zero" * - * @run testng/othervm -Xmx6G TestStringEncodingJumbo + * @run testng/othervm/timeout=480 -Xmx6G TestStringEncodingJumbo */ public class TestStringEncodingJumbo { diff --git a/test/jdk/java/foreign/TestStubAllocFailure.java b/test/jdk/java/foreign/TestStubAllocFailure.java index b3b327e788c..8cd4a61626e 100644 --- a/test/jdk/java/foreign/TestStubAllocFailure.java +++ b/test/jdk/java/foreign/TestStubAllocFailure.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ * @library ../ /test/lib * @requires jdk.foreign.linker != "FALLBACK" * @requires vm.compMode != "Xcomp" - * @run testng/othervm/native + * @run testng/othervm/native/timeout=480 * --enable-native-access=ALL-UNNAMED * TestStubAllocFailure */ diff --git a/test/jdk/java/foreign/TestUpcallStack.java b/test/jdk/java/foreign/TestUpcallStack.java index 726373b9e27..4552cbef734 100644 --- a/test/jdk/java/foreign/TestUpcallStack.java +++ b/test/jdk/java/foreign/TestUpcallStack.java @@ -27,7 +27,7 @@ * @modules java.base/jdk.internal.foreign * @build NativeTestHelper CallGeneratorHelper TestUpcallBase * - * @run testng/othervm/native -Xcheck:jni -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies + * @run testng/othervm/native/timeout=480 -Xcheck:jni -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies * --enable-native-access=ALL-UNNAMED -Dgenerator.sample.factor=17 * TestUpcallStack */ diff --git a/test/jdk/java/foreign/loaderLookup/TestLoaderLookup.java b/test/jdk/java/foreign/loaderLookup/TestLoaderLookup.java index cc44d194174..204f4038144 100644 --- a/test/jdk/java/foreign/loaderLookup/TestLoaderLookup.java +++ b/test/jdk/java/foreign/loaderLookup/TestLoaderLookup.java @@ -25,7 +25,7 @@ * @test * @compile lookup/Lookup.java * @compile invoker/Invoker.java - * @run main/othervm/native --enable-native-access=ALL-UNNAMED TestLoaderLookup + * @run main/othervm/native/timeout=480 --enable-native-access=ALL-UNNAMED TestLoaderLookup */ import java.lang.foreign.*; diff --git a/test/jdk/java/io/FileInputStream/UnreferencedFISClosesFd.java b/test/jdk/java/io/FileInputStream/UnreferencedFISClosesFd.java index ac5d6c6a329..e0aeb76f93f 100644 --- a/test/jdk/java/io/FileInputStream/UnreferencedFISClosesFd.java +++ b/test/jdk/java/io/FileInputStream/UnreferencedFISClosesFd.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -30,7 +30,7 @@ * @bug 6524062 * @summary Test to ensure that FIS.finalize() invokes the close() method as per * the specification. - * @run main/othervm UnreferencedFISClosesFd + * @run main/othervm/timeout=480 UnreferencedFISClosesFd */ import java.io.File; import java.io.FileDescriptor; diff --git a/test/jdk/java/io/FileOutputStream/UnreferencedFOSClosesFd.java b/test/jdk/java/io/FileOutputStream/UnreferencedFOSClosesFd.java index 3ff817085bd..ada39a2803a 100644 --- a/test/jdk/java/io/FileOutputStream/UnreferencedFOSClosesFd.java +++ b/test/jdk/java/io/FileOutputStream/UnreferencedFOSClosesFd.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -29,7 +29,7 @@ * @build jdk.test.lib.util.FileUtils UnreferencedFOSClosesFd * @bug 6524062 * @summary Test to ensure that the fd is closed if left unreferenced - * @run main/othervm UnreferencedFOSClosesFd + * @run main/othervm/timeout=480 UnreferencedFOSClosesFd */ import java.io.File; import java.io.FileDescriptor; diff --git a/test/jdk/java/io/RandomAccessFile/UnreferencedRAFClosesFd.java b/test/jdk/java/io/RandomAccessFile/UnreferencedRAFClosesFd.java index c5b73a07c7d..99212b9a837 100644 --- a/test/jdk/java/io/RandomAccessFile/UnreferencedRAFClosesFd.java +++ b/test/jdk/java/io/RandomAccessFile/UnreferencedRAFClosesFd.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -48,7 +48,7 @@ import jdk.test.lib.util.FileUtils; * @build jdk.test.lib.util.FileUtils UnreferencedRAFClosesFd * @modules java.base/java.io:open * @summary Test to ensure that an unclosed and unreferenced RandomAccessFile closes the fd - * @run main/othervm UnreferencedRAFClosesFd + * @run main/othervm/timeout=480 UnreferencedRAFClosesFd */ public class UnreferencedRAFClosesFd { diff --git a/test/jdk/java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java b/test/jdk/java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java index 51ce41d837b..4f700df33dc 100644 --- a/test/jdk/java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java +++ b/test/jdk/java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -57,7 +57,7 @@ import jdk.internal.module.Modules; * loads all classes and get their declared fields * and call setAccessible(false) followed by setAccessible(true); * @modules java.base/jdk.internal.module - * @run main/othervm --add-modules=ALL-SYSTEM FieldSetAccessibleTest + * @run main/othervm/timeout=480 --add-modules=ALL-SYSTEM FieldSetAccessibleTest * * @author danielfuchs */ diff --git a/test/jdk/java/lang/Math/IntegralPowTest.java b/test/jdk/java/lang/Math/IntegralPowTest.java index b0aadcc8d3b..ffbb499e0c8 100644 --- a/test/jdk/java/lang/Math/IntegralPowTest.java +++ b/test/jdk/java/lang/Math/IntegralPowTest.java @@ -25,7 +25,7 @@ * @test * @bug 8355992 * @summary Tests for StrictMath.*PowExact and .*unsignedMultiplyExact - * @run junit IntegralPowTest + * @run junit/timeout=480 IntegralPowTest */ import org.junit.jupiter.api.Test; diff --git a/test/jdk/java/lang/ProcessBuilder/FDLeakTest/FDLeakTest.java b/test/jdk/java/lang/ProcessBuilder/FDLeakTest/FDLeakTest.java index 146c2be563f..02f3583f0b3 100644 --- a/test/jdk/java/lang/ProcessBuilder/FDLeakTest/FDLeakTest.java +++ b/test/jdk/java/lang/ProcessBuilder/FDLeakTest/FDLeakTest.java @@ -27,7 +27,7 @@ * @summary Check that we don't leak FDs * @requires os.family != "windows" * @library /test/lib - * @run main/othervm/native -Djdk.lang.Process.launchMechanism=posix_spawn -agentlib:FDLeaker FDLeakTest + * @run main/othervm/native/timeout=480 -Djdk.lang.Process.launchMechanism=posix_spawn -agentlib:FDLeaker FDLeakTest */ /** @@ -35,7 +35,7 @@ * @summary Check that we don't leak FDs * @requires os.family != "windows" * @library /test/lib - * @run main/othervm/native -Djdk.lang.Process.launchMechanism=fork -agentlib:FDLeaker FDLeakTest + * @run main/othervm/native/timeout=480 -Djdk.lang.Process.launchMechanism=fork -agentlib:FDLeaker FDLeakTest */ /** @@ -43,7 +43,7 @@ * @summary Check that we don't leak FDs * @requires os.family == "linux" * @library /test/lib - * @run main/othervm/native -Djdk.lang.Process.launchMechanism=vfork -agentlib:FDLeaker FDLeakTest + * @run main/othervm/native/timeout=480 -Djdk.lang.Process.launchMechanism=vfork -agentlib:FDLeaker FDLeakTest */ import jdk.test.lib.process.ProcessTools; diff --git a/test/jdk/java/lang/ProcessBuilder/UnblockSignals.java b/test/jdk/java/lang/ProcessBuilder/UnblockSignals.java index d2625518b6d..5f310ff7df4 100644 --- a/test/jdk/java/lang/ProcessBuilder/UnblockSignals.java +++ b/test/jdk/java/lang/ProcessBuilder/UnblockSignals.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -30,8 +30,8 @@ import java.io.IOException; * @requires (os.family == "linux" | os.family == "mac") * @comment Don't allow -Xcomp, it disturbs the relative timing of the sleep and kill commands * @requires (vm.compMode != "Xcomp") - * @run main/othervm -Djdk.lang.Process.launchMechanism=POSIX_SPAWN UnblockSignals - * @run main/othervm -Djdk.lang.Process.launchMechanism=POSIX_SPAWN -Xrs UnblockSignals + * @run main/othervm/timeout=480 -Djdk.lang.Process.launchMechanism=POSIX_SPAWN UnblockSignals + * @run main/othervm/timeout=480 -Djdk.lang.Process.launchMechanism=POSIX_SPAWN -Xrs UnblockSignals */ /* @@ -41,8 +41,8 @@ import java.io.IOException; * @requires (os.family == "linux" | os.family == "mac") * @comment Don't allow -Xcomp, it disturbs the relative timing of the sleep and kill commands * @requires (vm.compMode != "Xcomp") - * @run main/othervm -Djdk.lang.Process.launchMechanism=FORK UnblockSignals - * @run main/othervm -Djdk.lang.Process.launchMechanism=FORK -Xrs UnblockSignals + * @run main/othervm/timeout=480 -Djdk.lang.Process.launchMechanism=FORK UnblockSignals + * @run main/othervm/timeout=480 -Djdk.lang.Process.launchMechanism=FORK -Xrs UnblockSignals */ public class UnblockSignals { diff --git a/test/jdk/java/lang/StackWalker/LocalsAndOperands.java b/test/jdk/java/lang/StackWalker/LocalsAndOperands.java index 900cad1246a..445a4efe649 100644 --- a/test/jdk/java/lang/StackWalker/LocalsAndOperands.java +++ b/test/jdk/java/lang/StackWalker/LocalsAndOperands.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,8 +26,8 @@ * @bug 8020968 8147039 8156073 * @summary Tests for locals and operands * @modules java.base/java.lang:open - * @run testng/othervm -Xint -DtestUnused=true LocalsAndOperands - * @run testng/othervm -Xcomp LocalsAndOperands + * @run testng/othervm/timeout=480 -Xint -DtestUnused=true LocalsAndOperands + * @run testng/othervm/timeout=480 -Xcomp LocalsAndOperands */ /* @@ -35,7 +35,7 @@ * @bug 8020968 8147039 8156073 * @modules java.base/java.lang:open * @requires !vm.graal.enabled - * @run testng/othervm -Xcomp -XX:-TieredCompilation LocalsAndOperands + * @run testng/othervm/timeout=480 -Xcomp -XX:-TieredCompilation LocalsAndOperands */ import org.testng.annotations.*; diff --git a/test/jdk/java/lang/String/CompactString/MaxSizeUTF16String.java b/test/jdk/java/lang/String/CompactString/MaxSizeUTF16String.java index 3511a870f39..076e3c53faf 100644 --- a/test/jdk/java/lang/String/CompactString/MaxSizeUTF16String.java +++ b/test/jdk/java/lang/String/CompactString/MaxSizeUTF16String.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -32,9 +32,9 @@ import java.nio.charset.StandardCharsets; * @summary Tests Compact String for maximum size strings * @requires os.maxMemory >= 8g & vm.bits == 64 * @requires vm.flagless - * @run junit/othervm -XX:+CompactStrings -Xmx8g MaxSizeUTF16String - * @run junit/othervm -XX:-CompactStrings -Xmx8g MaxSizeUTF16String - * @run junit/othervm -Xcomp -Xmx8g MaxSizeUTF16String + * @run junit/othervm/timeout=480 -XX:+CompactStrings -Xmx8g MaxSizeUTF16String + * @run junit/othervm/timeout=480 -XX:-CompactStrings -Xmx8g MaxSizeUTF16String + * @run junit/othervm/timeout=480 -Xcomp -Xmx8g MaxSizeUTF16String */ public class MaxSizeUTF16String { diff --git a/test/jdk/java/lang/StringBuilder/CompactStringBuilder.java b/test/jdk/java/lang/StringBuilder/CompactStringBuilder.java index 49eb3b28ff3..2a6e92e9402 100644 --- a/test/jdk/java/lang/StringBuilder/CompactStringBuilder.java +++ b/test/jdk/java/lang/StringBuilder/CompactStringBuilder.java @@ -33,9 +33,9 @@ import static org.testng.Assert.assertTrue; * @bug 8054307 8077559 8351443 * @summary Tests Compact String. This test is testing StringBuilder * behavior related to Compact String. - * @run testng/othervm -XX:+CompactStrings CompactStringBuilder - * @run testng/othervm -XX:-CompactStrings CompactStringBuilder - * @run testng/othervm -Xcomp CompactStringBuilder + * @run testng/othervm/timeout=480 -XX:+CompactStrings CompactStringBuilder + * @run testng/othervm/timeout=480 -XX:-CompactStrings CompactStringBuilder + * @run testng/othervm/timeout=480 -Xcomp CompactStringBuilder */ public class CompactStringBuilder { diff --git a/test/jdk/java/lang/Thread/virtual/CancelTimerWithContention.java b/test/jdk/java/lang/Thread/virtual/CancelTimerWithContention.java index 840e40453c6..9c8e37e8c6d 100644 --- a/test/jdk/java/lang/Thread/virtual/CancelTimerWithContention.java +++ b/test/jdk/java/lang/Thread/virtual/CancelTimerWithContention.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,7 +27,7 @@ * contention on the timer queue * @requires vm.continuations * @key randomness - * @run main/othervm + * @run main/othervm/timeout=480 * -Djdk.virtualThreadScheduler.parallelism=2 * -Djdk.virtualThreadScheduler.timerQueues=1 * CancelTimerWithContention diff --git a/test/jdk/java/lang/Thread/virtual/MiscMonitorTests.java b/test/jdk/java/lang/Thread/virtual/MiscMonitorTests.java index b512aa75789..32586812614 100644 --- a/test/jdk/java/lang/Thread/virtual/MiscMonitorTests.java +++ b/test/jdk/java/lang/Thread/virtual/MiscMonitorTests.java @@ -27,7 +27,7 @@ * @library /test/lib * @requires vm.continuations * @modules java.base/java.lang:+open - * @run junit/othervm MiscMonitorTests + * @run junit/othervm/timeout=480 MiscMonitorTests */ /* @@ -35,7 +35,7 @@ * @library /test/lib * @requires vm.continuations * @modules java.base/java.lang:+open - * @run junit/othervm -Xint MiscMonitorTests + * @run junit/othervm/timeout=480 -Xint MiscMonitorTests */ /* @@ -43,7 +43,7 @@ * @library /test/lib * @requires vm.continuations * @modules java.base/java.lang:+open - * @run junit/othervm -Xcomp MiscMonitorTests + * @run junit/othervm/timeout=480 -Xcomp MiscMonitorTests */ /* @@ -51,7 +51,7 @@ * @library /test/lib * @requires vm.continuations * @modules java.base/java.lang:+open - * @run junit/othervm -Xcomp -XX:TieredStopAtLevel=3 MiscMonitorTests + * @run junit/othervm/timeout=480 -Xcomp -XX:TieredStopAtLevel=3 MiscMonitorTests */ /* @@ -60,7 +60,7 @@ * @library /test/lib * @requires vm.continuations * @modules java.base/java.lang:+open - * @run junit/othervm -Xcomp -XX:-TieredCompilation MiscMonitorTests + * @run junit/othervm/timeout=480 -Xcomp -XX:-TieredCompilation MiscMonitorTests */ /* @@ -68,7 +68,7 @@ * @requires vm.debug == true & vm.continuations * @library /test/lib * @modules java.base/java.lang:+open - * @run junit/othervm -XX:+UnlockDiagnosticVMOptions -XX:+FullGCALot -XX:FullGCALotInterval=1000 MiscMonitorTests + * @run junit/othervm/timeout=480 -XX:+UnlockDiagnosticVMOptions -XX:+FullGCALot -XX:FullGCALotInterval=1000 MiscMonitorTests */ import java.util.concurrent.atomic.AtomicInteger; diff --git a/test/jdk/java/lang/Thread/virtual/MonitorEnterExit.java b/test/jdk/java/lang/Thread/virtual/MonitorEnterExit.java index 3a7eecd054e..14b8ffc1949 100644 --- a/test/jdk/java/lang/Thread/virtual/MonitorEnterExit.java +++ b/test/jdk/java/lang/Thread/virtual/MonitorEnterExit.java @@ -26,35 +26,35 @@ * @summary Test virtual thread with monitor enter/exit * @modules java.base/java.lang:+open jdk.management * @library /test/lib - * @run junit/othervm/native --enable-native-access=ALL-UNNAMED MonitorEnterExit + * @run junit/othervm/native/timeout=480 --enable-native-access=ALL-UNNAMED MonitorEnterExit */ /* * @test id=Xint * @modules java.base/java.lang:+open jdk.management * @library /test/lib - * @run junit/othervm/native -Xint --enable-native-access=ALL-UNNAMED MonitorEnterExit + * @run junit/othervm/native/timeout=480 -Xint --enable-native-access=ALL-UNNAMED MonitorEnterExit */ /* * @test id=Xcomp * @modules java.base/java.lang:+open jdk.management * @library /test/lib - * @run junit/othervm/native -Xcomp --enable-native-access=ALL-UNNAMED MonitorEnterExit + * @run junit/othervm/native/timeout=480 -Xcomp --enable-native-access=ALL-UNNAMED MonitorEnterExit */ /* * @test id=Xcomp-TieredStopAtLevel1 * @modules java.base/java.lang:+open jdk.management * @library /test/lib - * @run junit/othervm/native -Xcomp -XX:TieredStopAtLevel=1 --enable-native-access=ALL-UNNAMED MonitorEnterExit + * @run junit/othervm/native/timeout=480 -Xcomp -XX:TieredStopAtLevel=1 --enable-native-access=ALL-UNNAMED MonitorEnterExit */ /* * @test id=Xcomp-noTieredCompilation * @modules java.base/java.lang:+open jdk.management * @library /test/lib - * @run junit/othervm/native -Xcomp -XX:-TieredCompilation --enable-native-access=ALL-UNNAMED MonitorEnterExit + * @run junit/othervm/native/timeout=480 -Xcomp -XX:-TieredCompilation --enable-native-access=ALL-UNNAMED MonitorEnterExit */ import java.time.Duration; diff --git a/test/jdk/java/lang/Thread/virtual/MonitorWaitNotify.java b/test/jdk/java/lang/Thread/virtual/MonitorWaitNotify.java index d5df8eb97d0..47089d9d6df 100644 --- a/test/jdk/java/lang/Thread/virtual/MonitorWaitNotify.java +++ b/test/jdk/java/lang/Thread/virtual/MonitorWaitNotify.java @@ -26,35 +26,35 @@ * @summary Test virtual threads using Object.wait/notifyAll * @modules java.base/java.lang:+open jdk.management * @library /test/lib - * @run junit/othervm/native --enable-native-access=ALL-UNNAMED MonitorWaitNotify + * @run junit/othervm/native/timeout=480 --enable-native-access=ALL-UNNAMED MonitorWaitNotify */ /* * @test id=Xint * @modules java.base/java.lang:+open jdk.management * @library /test/lib - * @run junit/othervm/native -Xint --enable-native-access=ALL-UNNAMED MonitorWaitNotify + * @run junit/othervm/native/timeout=480 -Xint --enable-native-access=ALL-UNNAMED MonitorWaitNotify */ /* * @test id=Xcomp * @modules java.base/java.lang:+open jdk.management * @library /test/lib - * @run junit/othervm/native -Xcomp --enable-native-access=ALL-UNNAMED MonitorWaitNotify + * @run junit/othervm/native/timeout=480 -Xcomp --enable-native-access=ALL-UNNAMED MonitorWaitNotify */ /* * @test id=Xcomp-TieredStopAtLevel1 * @modules java.base/java.lang:+open jdk.management * @library /test/lib - * @run junit/othervm/native -Xcomp -XX:TieredStopAtLevel=1 --enable-native-access=ALL-UNNAMED MonitorWaitNotify + * @run junit/othervm/native/timeout=480 -Xcomp -XX:TieredStopAtLevel=1 --enable-native-access=ALL-UNNAMED MonitorWaitNotify */ /* * @test id=Xcomp-noTieredCompilation * @modules java.base/java.lang:+open jdk.management * @library /test/lib - * @run junit/othervm/native -Xcomp -XX:-TieredCompilation --enable-native-access=ALL-UNNAMED MonitorWaitNotify + * @run junit/othervm/native/timeout=480 -Xcomp -XX:-TieredCompilation --enable-native-access=ALL-UNNAMED MonitorWaitNotify */ import java.util.ArrayList; diff --git a/test/jdk/java/lang/Thread/virtual/Parking.java b/test/jdk/java/lang/Thread/virtual/Parking.java index 574707e637c..c337f36e7c2 100644 --- a/test/jdk/java/lang/Thread/virtual/Parking.java +++ b/test/jdk/java/lang/Thread/virtual/Parking.java @@ -26,28 +26,28 @@ * @summary Test virtual threads using park/unpark * @modules java.base/java.lang:+open jdk.management * @library /test/lib - * @run junit Parking + * @run junit/timeout=480 Parking */ /* * @test id=Xint * @modules java.base/java.lang:+open jdk.management * @library /test/lib - * @run junit/othervm -Xint Parking + * @run junit/othervm/timeout=480 -Xint Parking */ /* * @test id=Xcomp * @modules java.base/java.lang:+open jdk.management * @library /test/lib - * @run junit/othervm -Xcomp Parking + * @run junit/othervm/timeout=480 -Xcomp Parking */ /* * @test id=Xcomp-noTieredCompilation * @modules java.base/java.lang:+open jdk.management * @library /test/lib - * @run junit/othervm -Xcomp -XX:-TieredCompilation Parking + * @run junit/othervm/timeout=480 -Xcomp -XX:-TieredCompilation Parking */ import java.time.Duration; diff --git a/test/jdk/java/lang/Thread/virtual/RetryMonitorEnterWhenPinned.java b/test/jdk/java/lang/Thread/virtual/RetryMonitorEnterWhenPinned.java index 1c7177d9f38..464259ecb86 100644 --- a/test/jdk/java/lang/Thread/virtual/RetryMonitorEnterWhenPinned.java +++ b/test/jdk/java/lang/Thread/virtual/RetryMonitorEnterWhenPinned.java @@ -29,7 +29,7 @@ * can't continue because there are no carriers available. * @modules java.base/java.lang:+open * @library /test/lib - * @run main/othervm/native --enable-native-access=ALL-UNNAMED RetryMonitorEnterWhenPinned + * @run main/othervm/native/timeout=480 --enable-native-access=ALL-UNNAMED RetryMonitorEnterWhenPinned */ import java.time.Duration; diff --git a/test/jdk/java/lang/Thread/virtual/Starvation.java b/test/jdk/java/lang/Thread/virtual/Starvation.java index 2b8da5fbca8..c55ad3c2494 100644 --- a/test/jdk/java/lang/Thread/virtual/Starvation.java +++ b/test/jdk/java/lang/Thread/virtual/Starvation.java @@ -25,7 +25,7 @@ * @requires vm.continuations * @library /test/lib * @bug 8345294 - * @run main/othervm/timeout=200/native --enable-native-access=ALL-UNNAMED Starvation 100000 + * @run main/othervm/timeout=800/native --enable-native-access=ALL-UNNAMED Starvation 100000 */ import java.time.Duration; diff --git a/test/jdk/java/lang/Thread/virtual/SynchronizedNative.java b/test/jdk/java/lang/Thread/virtual/SynchronizedNative.java index c894944aa25..7a3da0ac334 100644 --- a/test/jdk/java/lang/Thread/virtual/SynchronizedNative.java +++ b/test/jdk/java/lang/Thread/virtual/SynchronizedNative.java @@ -28,7 +28,7 @@ * @requires vm.continuations * @modules java.base/java.lang:+open jdk.management * @library /test/lib - * @run junit/othervm/native --enable-native-access=ALL-UNNAMED SynchronizedNative + * @run junit/othervm/native/timeout=480 --enable-native-access=ALL-UNNAMED SynchronizedNative */ /* @@ -36,7 +36,7 @@ * @requires vm.continuations * @modules java.base/java.lang:+open jdk.management * @library /test/lib - * @run junit/othervm/native -Xint --enable-native-access=ALL-UNNAMED SynchronizedNative + * @run junit/othervm/native/timeout=480 -Xint --enable-native-access=ALL-UNNAMED SynchronizedNative */ /* @@ -44,7 +44,7 @@ * @requires vm.continuations * @modules java.base/java.lang:+open jdk.management * @library /test/lib - * @run junit/othervm/native -Xcomp -XX:TieredStopAtLevel=1 --enable-native-access=ALL-UNNAMED SynchronizedNative + * @run junit/othervm/native/timeout=480 -Xcomp -XX:TieredStopAtLevel=1 --enable-native-access=ALL-UNNAMED SynchronizedNative */ /* @@ -52,7 +52,7 @@ * @requires vm.continuations * @modules java.base/java.lang:+open jdk.management * @library /test/lib - * @run junit/othervm/native -Xcomp -XX:-TieredCompilation --enable-native-access=ALL-UNNAMED SynchronizedNative + * @run junit/othervm/native/timeout=480 -Xcomp -XX:-TieredCompilation --enable-native-access=ALL-UNNAMED SynchronizedNative */ import java.util.concurrent.CountDownLatch; diff --git a/test/jdk/java/lang/Thread/virtual/ThreadPollOnYield.java b/test/jdk/java/lang/Thread/virtual/ThreadPollOnYield.java index 4e6c3c12269..56257b8847e 100644 --- a/test/jdk/java/lang/Thread/virtual/ThreadPollOnYield.java +++ b/test/jdk/java/lang/Thread/virtual/ThreadPollOnYield.java @@ -27,7 +27,7 @@ * @summary Test that Thread.yield loop polls for safepoints * @requires vm.continuations * @library /test/lib - * @run junit/othervm/native --enable-native-access=ALL-UNNAMED ThreadPollOnYield + * @run junit/othervm/native/timeout=480 --enable-native-access=ALL-UNNAMED ThreadPollOnYield */ /* @@ -36,7 +36,7 @@ * @summary Test that Thread.yield loop polls for safepoints * @requires vm.continuations & vm.compMode != "Xcomp" * @library /test/lib - * @run junit/othervm/native --enable-native-access=ALL-UNNAMED -Xcomp -XX:-TieredCompilation + * @run junit/othervm/native/timeout=480 --enable-native-access=ALL-UNNAMED -Xcomp -XX:-TieredCompilation * -XX:CompileCommand=inline,*::yield* -XX:CompileCommand=inline,*::*Yield ThreadPollOnYield */ diff --git a/test/jdk/java/lang/Thread/virtual/stress/GetStackTraceALotWhenBlocking.java b/test/jdk/java/lang/Thread/virtual/stress/GetStackTraceALotWhenBlocking.java index 17b63573d85..fa4d16d9f82 100644 --- a/test/jdk/java/lang/Thread/virtual/stress/GetStackTraceALotWhenBlocking.java +++ b/test/jdk/java/lang/Thread/virtual/stress/GetStackTraceALotWhenBlocking.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -28,7 +28,7 @@ * @requires vm.debug != true * @modules jdk.management * @library /test/lib - * @run main/othervm/timeout=300 GetStackTraceALotWhenBlocking 100000 + * @run main/othervm/timeout=1200 GetStackTraceALotWhenBlocking 100000 */ /* @@ -36,7 +36,7 @@ * @requires vm.debug == true & vm.continuations * @modules jdk.management * @library /test/lib - * @run main/othervm/timeout=300 GetStackTraceALotWhenBlocking 50000 + * @run main/othervm/timeout=1200 GetStackTraceALotWhenBlocking 50000 */ import java.time.Instant; diff --git a/test/jdk/java/lang/Thread/virtual/stress/GetStackTraceALotWithTimedWait.java b/test/jdk/java/lang/Thread/virtual/stress/GetStackTraceALotWithTimedWait.java index ad3fbdf0565..0e8693756e5 100644 --- a/test/jdk/java/lang/Thread/virtual/stress/GetStackTraceALotWithTimedWait.java +++ b/test/jdk/java/lang/Thread/virtual/stress/GetStackTraceALotWithTimedWait.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,13 +25,13 @@ * @test * @summary Stress test Thread.getStackTrace on a virtual thread in timed-Object.wait * @requires vm.debug != true - * @run main GetStackTraceALotWithTimedWait 100000 + * @run main/timeout=480 GetStackTraceALotWithTimedWait 100000 */ /* * @test * @requires vm.debug == true - * @run main GetStackTraceALotWithTimedWait 50000 + * @run main/timeout=480 GetStackTraceALotWithTimedWait 50000 */ import java.time.Instant; @@ -88,4 +88,3 @@ public class GetStackTraceALotWithTimedWait { } } } - diff --git a/test/jdk/java/lang/Thread/virtual/stress/ParkALot.java b/test/jdk/java/lang/Thread/virtual/stress/ParkALot.java index c30193bc121..29704fd8975 100644 --- a/test/jdk/java/lang/Thread/virtual/stress/ParkALot.java +++ b/test/jdk/java/lang/Thread/virtual/stress/ParkALot.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,14 +26,14 @@ * @summary Stress test parking and unparking * @requires vm.debug != true * @library /test/lib - * @run main/othervm/timeout=300 ParkALot 300000 + * @run main/othervm/timeout=1200 ParkALot 300000 */ /* * @test * @requires vm.debug == true * @library /test/lib - * @run main/othervm/timeout=300 ParkALot 100000 + * @run main/othervm/timeout=1200 ParkALot 100000 */ import java.time.Instant; diff --git a/test/jdk/java/lang/Thread/virtual/stress/PinALot.java b/test/jdk/java/lang/Thread/virtual/stress/PinALot.java index ff45ea837ae..2da43388a85 100644 --- a/test/jdk/java/lang/Thread/virtual/stress/PinALot.java +++ b/test/jdk/java/lang/Thread/virtual/stress/PinALot.java @@ -26,14 +26,14 @@ * @summary Stress test timed park when pinned * @requires vm.debug != true * @library /test/lib - * @run main/othervm/native --enable-native-access=ALL-UNNAMED PinALot 500000 + * @run main/othervm/native/timeout=480 --enable-native-access=ALL-UNNAMED PinALot 500000 */ /* * @test * @requires vm.debug == true * @library /test/lib - * @run main/othervm/native/timeout=300 --enable-native-access=ALL-UNNAMED PinALot 200000 + * @run main/othervm/native/timeout=1200 --enable-native-access=ALL-UNNAMED PinALot 200000 */ import java.time.Duration; diff --git a/test/jdk/java/lang/Thread/virtual/stress/Skynet.java b/test/jdk/java/lang/Thread/virtual/stress/Skynet.java index 1d9a5b7104b..06f3b5ff235 100644 --- a/test/jdk/java/lang/Thread/virtual/stress/Skynet.java +++ b/test/jdk/java/lang/Thread/virtual/stress/Skynet.java @@ -26,13 +26,13 @@ * @summary Stress test virtual threads with a variation of the Skynet 1M benchmark * @requires vm.continuations * @requires !vm.debug | vm.gc != "Z" - * @run main/othervm/timeout=400 -Xmx1500m Skynet + * @run main/othervm/timeout=1600 -Xmx1500m Skynet */ /* * @test id=Z * @requires vm.debug == true & vm.continuations * @requires vm.gc.Z - * @run main/othervm/timeout=400 -XX:+UnlockDiagnosticVMOptions + * @run main/othervm/timeout=1600 -XX:+UnlockDiagnosticVMOptions * -XX:+UseZGC * -XX:+ZVerifyOops -XX:ZCollectionInterval=0.01 -Xmx1500m Skynet */ diff --git a/test/jdk/java/lang/Thread/virtual/stress/Skynet100kWithMonitors.java b/test/jdk/java/lang/Thread/virtual/stress/Skynet100kWithMonitors.java index 7949529af60..77eed59c88d 100644 --- a/test/jdk/java/lang/Thread/virtual/stress/Skynet100kWithMonitors.java +++ b/test/jdk/java/lang/Thread/virtual/stress/Skynet100kWithMonitors.java @@ -27,13 +27,13 @@ * a channel implementation based on object monitors. This variant uses a reduced number of * 100k virtual threads at the final level. * @requires vm.debug != true & vm.continuations - * @run main/othervm/timeout=300 Skynet100kWithMonitors 50 + * @run main/othervm/timeout=1200 Skynet100kWithMonitors 50 */ /* * @test * @requires vm.debug == true & vm.continuations - * @run main/othervm/timeout=300 Skynet100kWithMonitors 10 + * @run main/othervm/timeout=1200 Skynet100kWithMonitors 10 */ public class Skynet100kWithMonitors { diff --git a/test/jdk/java/lang/Thread/virtual/stress/SleepALot.java b/test/jdk/java/lang/Thread/virtual/stress/SleepALot.java index d10897629c4..fadc5c3446b 100644 --- a/test/jdk/java/lang/Thread/virtual/stress/SleepALot.java +++ b/test/jdk/java/lang/Thread/virtual/stress/SleepALot.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,13 +25,13 @@ * @test * @summary Stress test Thread.sleep * @requires vm.debug != true & vm.continuations - * @run main SleepALot 500000 + * @run main/timeout=480 SleepALot 500000 */ /* * @test * @requires vm.debug == true & vm.continuations - * @run main/othervm/timeout=300 SleepALot 200000 + * @run main/othervm/timeout=1200 SleepALot 200000 */ import java.time.Duration; diff --git a/test/jdk/java/lang/annotation/LoaderLeakTest.java b/test/jdk/java/lang/annotation/LoaderLeakTest.java index 762a08f9990..6b31add49a4 100644 --- a/test/jdk/java/lang/annotation/LoaderLeakTest.java +++ b/test/jdk/java/lang/annotation/LoaderLeakTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,7 +27,7 @@ * @summary annotations cause memory leak * @library /test/lib * @build jdk.test.lib.process.* - * @run testng LoaderLeakTest + * @run testng/timeout=480 LoaderLeakTest */ import jdk.test.lib.Utils; diff --git a/test/jdk/java/lang/invoke/TestLambdaFormCustomization.java b/test/jdk/java/lang/invoke/TestLambdaFormCustomization.java index 60ba4af590e..7635851724e 100644 --- a/test/jdk/java/lang/invoke/TestLambdaFormCustomization.java +++ b/test/jdk/java/lang/invoke/TestLambdaFormCustomization.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -29,8 +29,8 @@ import java.util.ArrayList; * @test * @bug 8340812 * @summary Verify that LambdaForm customization via MethodHandle::updateForm is thread safe. - * @run main TestLambdaFormCustomization - * @run main/othervm -Djava.lang.invoke.MethodHandle.CUSTOMIZE_THRESHOLD=0 TestLambdaFormCustomization + * @run main/timeout=480 TestLambdaFormCustomization + * @run main/othervm/timeout=480 -Djava.lang.invoke.MethodHandle.CUSTOMIZE_THRESHOLD=0 TestLambdaFormCustomization */ public class TestLambdaFormCustomization { diff --git a/test/jdk/java/lang/reflect/IllegalArgumentsTest.java b/test/jdk/java/lang/reflect/IllegalArgumentsTest.java index bb9efe29e51..7260c04c10a 100644 --- a/test/jdk/java/lang/reflect/IllegalArgumentsTest.java +++ b/test/jdk/java/lang/reflect/IllegalArgumentsTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,7 +25,7 @@ * @test * @bug 8277964 * @summary Test IllegalArgumentException be thrown when an argument is invalid - * @run testng/othervm/timeout=180 IllegalArgumentsTest + * @run testng/othervm/timeout=720 IllegalArgumentsTest */ import java.lang.reflect.Constructor; diff --git a/test/jdk/java/math/BigInteger/LargeValueExceptions.java b/test/jdk/java/math/BigInteger/LargeValueExceptions.java index bba3a23b438..4c85281a5c0 100644 --- a/test/jdk/java/math/BigInteger/LargeValueExceptions.java +++ b/test/jdk/java/math/BigInteger/LargeValueExceptions.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ * @bug 8200698 * @summary Tests that exceptions are thrown for ops which would overflow * @requires (sun.arch.data.model == "64" & os.maxMemory >= 4g) - * @run testng/othervm -Xmx4g LargeValueExceptions + * @run testng/othervm/timeout=480 -Xmx4g LargeValueExceptions */ import java.math.BigInteger; import static java.math.BigInteger.ONE; diff --git a/test/jdk/java/net/DatagramSocket/UnreferencedDatagramSockets.java b/test/jdk/java/net/DatagramSocket/UnreferencedDatagramSockets.java index c8a1659368a..dff8b38d3c1 100644 --- a/test/jdk/java/net/DatagramSocket/UnreferencedDatagramSockets.java +++ b/test/jdk/java/net/DatagramSocket/UnreferencedDatagramSockets.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,8 +26,8 @@ * @library /test/lib * @modules java.management java.base/java.io:+open java.base/java.net:+open * java.base/sun.net java.base/sun.nio.ch:+open - * @run main/othervm UnreferencedDatagramSockets - * @run main/othervm -Djava.net.preferIPv4Stack=true UnreferencedDatagramSockets + * @run main/othervm/timeout=480 UnreferencedDatagramSockets + * @run main/othervm/timeout=480 -Djava.net.preferIPv4Stack=true UnreferencedDatagramSockets * @summary Check that unreferenced datagram sockets are closed */ diff --git a/test/jdk/java/net/MulticastSocket/SetLoopbackModeIPv4.java b/test/jdk/java/net/MulticastSocket/SetLoopbackModeIPv4.java index 87d62fdd685..13383a397f9 100644 --- a/test/jdk/java/net/MulticastSocket/SetLoopbackModeIPv4.java +++ b/test/jdk/java/net/MulticastSocket/SetLoopbackModeIPv4.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -42,5 +42,3 @@ public class SetLoopbackModeIPv4 { SetLoopbackMode.main(args); } } - - diff --git a/test/jdk/java/net/MulticastSocket/UnreferencedMulticastSockets.java b/test/jdk/java/net/MulticastSocket/UnreferencedMulticastSockets.java index 6e318dd77d7..2a87207c961 100644 --- a/test/jdk/java/net/MulticastSocket/UnreferencedMulticastSockets.java +++ b/test/jdk/java/net/MulticastSocket/UnreferencedMulticastSockets.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,8 +26,8 @@ * @library /test/lib * @modules java.management java.base/java.io:+open java.base/java.net:+open * java.base/sun.net java.base/sun.nio.ch:+open - * @run main/othervm -Djava.net.preferIPv4Stack=true UnreferencedMulticastSockets - * @run main/othervm UnreferencedMulticastSockets + * @run main/othervm/timeout=480 -Djava.net.preferIPv4Stack=true UnreferencedMulticastSockets + * @run main/othervm/timeout=480 UnreferencedMulticastSockets * @summary Check that unreferenced multicast sockets are closed */ diff --git a/test/jdk/java/net/ServerSocket/UnreferencedSockets.java b/test/jdk/java/net/ServerSocket/UnreferencedSockets.java index baed6c156d5..61e1bbfc21d 100644 --- a/test/jdk/java/net/ServerSocket/UnreferencedSockets.java +++ b/test/jdk/java/net/ServerSocket/UnreferencedSockets.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,8 +25,8 @@ * @test * @library /test/lib * @modules java.management java.base/java.io:+open java.base/java.net:+open - * @run main/othervm UnreferencedSockets - * @run main/othervm -Djava.net.preferIPv4Stack=true UnreferencedSockets + * @run main/othervm/timeout=480 UnreferencedSockets + * @run main/othervm/timeout=480 -Djava.net.preferIPv4Stack=true UnreferencedSockets * @summary Check that unreferenced sockets are closed */ diff --git a/test/jdk/java/net/Socket/CloseAvailable.java b/test/jdk/java/net/Socket/CloseAvailable.java index 5ff7e0c03a3..dfaf92d9219 100644 --- a/test/jdk/java/net/Socket/CloseAvailable.java +++ b/test/jdk/java/net/Socket/CloseAvailable.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,8 +26,8 @@ * @bug 4091859 8189366 * @library /test/lib * @summary Test Socket.getInputStream().available() - * @run main CloseAvailable - * @run main/othervm -Djava.net.preferIPv4Stack=true CloseAvailable + * @run main/timeout=480 CloseAvailable + * @run main/othervm/timeout=480 -Djava.net.preferIPv4Stack=true CloseAvailable */ import java.net.*; diff --git a/test/jdk/java/net/httpclient/AsFileDownloadTest.java b/test/jdk/java/net/httpclient/AsFileDownloadTest.java index 1ec26777696..31d919230a4 100644 --- a/test/jdk/java/net/httpclient/AsFileDownloadTest.java +++ b/test/jdk/java/net/httpclient/AsFileDownloadTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -76,7 +76,7 @@ import static org.testng.Assert.fail; * @build jdk.httpclient.test.lib.http2.Http2TestServer jdk.test.lib.net.SimpleSSLContext * jdk.test.lib.Platform jdk.test.lib.util.FileUtils * jdk.httpclient.test.lib.common.TestServerConfigurator - * @run testng/othervm AsFileDownloadTest + * @run testng/othervm/timeout=480 AsFileDownloadTest */ public class AsFileDownloadTest { diff --git a/test/jdk/java/net/httpclient/BufferingSubscriberTest.java b/test/jdk/java/net/httpclient/BufferingSubscriberTest.java index c35c62c062a..6d15ba5d3a8 100644 --- a/test/jdk/java/net/httpclient/BufferingSubscriberTest.java +++ b/test/jdk/java/net/httpclient/BufferingSubscriberTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -54,7 +54,7 @@ import static org.testng.Assert.*; * @key randomness * @library /test/lib * @build jdk.test.lib.RandomFactory - * @run testng/othervm -Djdk.internal.httpclient.debug=true BufferingSubscriberTest + * @run testng/othervm/timeout=480 -Djdk.internal.httpclient.debug=true BufferingSubscriberTest */ public class BufferingSubscriberTest { diff --git a/test/jdk/java/net/httpclient/CancelledResponse.java b/test/jdk/java/net/httpclient/CancelledResponse.java index f69bf066ba2..44be38317dc 100644 --- a/test/jdk/java/net/httpclient/CancelledResponse.java +++ b/test/jdk/java/net/httpclient/CancelledResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -59,8 +59,8 @@ import static java.nio.charset.StandardCharsets.ISO_8859_1; * @modules java.net.http/jdk.internal.net.http.common * @build jdk.test.lib.net.SimpleSSLContext * @build MockServer ReferenceTracker - * @run main/othervm CancelledResponse - * @run main/othervm CancelledResponse SSL + * @run main/othervm/timeout=480 CancelledResponse + * @run main/othervm/timeout=480 CancelledResponse SSL */ /** diff --git a/test/jdk/java/net/httpclient/HttpSlowServerTest.java b/test/jdk/java/net/httpclient/HttpSlowServerTest.java index 85db9bba563..a71eaf746ad 100644 --- a/test/jdk/java/net/httpclient/HttpSlowServerTest.java +++ b/test/jdk/java/net/httpclient/HttpSlowServerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -61,7 +61,7 @@ import static java.net.http.HttpClient.Version.HTTP_2; * @build jdk.httpclient.test.lib.common.HttpServerAdapters jdk.test.lib.net.SimpleSSLContext * DigestEchoServer HttpSlowServerTest * jdk.httpclient.test.lib.common.TestServerConfigurator - * @run main/othervm -Dtest.requiresHost=true + * @run main/othervm/timeout=480 -Dtest.requiresHost=true * -Djdk.httpclient.HttpClient.log=headers * -Djdk.internal.httpclient.debug=false * HttpSlowServerTest diff --git a/test/jdk/java/net/httpclient/ManyRequests.java b/test/jdk/java/net/httpclient/ManyRequests.java index 493c2c3a504..c196ef76466 100644 --- a/test/jdk/java/net/httpclient/ManyRequests.java +++ b/test/jdk/java/net/httpclient/ManyRequests.java @@ -33,10 +33,10 @@ * @compile ../../../com/sun/net/httpserver/LogFilter.java * @compile ../../../com/sun/net/httpserver/EchoHandler.java * @compile ../../../com/sun/net/httpserver/FileServerHandler.java - * @run main/othervm/timeout=40 -Djdk.httpclient.HttpClient.log=ssl,channel ManyRequests - * @run main/othervm/timeout=40 -Djdk.httpclient.HttpClient.log=channel -Dtest.insertDelay=true ManyRequests - * @run main/othervm/timeout=40 -Djdk.httpclient.HttpClient.log=channel -Dtest.chunkSize=64 ManyRequests - * @run main/othervm/timeout=40 -Djdk.httpclient.HttpClient.log=channel -Dtest.insertDelay=true -Dtest.chunkSize=64 ManyRequests + * @run main/othervm/timeout=160 -Djdk.httpclient.HttpClient.log=ssl,channel ManyRequests + * @run main/othervm/timeout=160 -Djdk.httpclient.HttpClient.log=channel -Dtest.insertDelay=true ManyRequests + * @run main/othervm/timeout=160 -Djdk.httpclient.HttpClient.log=channel -Dtest.chunkSize=64 ManyRequests + * @run main/othervm/timeout=160 -Djdk.httpclient.HttpClient.log=channel -Dtest.insertDelay=true -Dtest.chunkSize=64 ManyRequests * @summary Send a large number of requests asynchronously */ // * @run main/othervm/timeout=40 -Djdk.httpclient.HttpClient.log=ssl,channel ManyRequests diff --git a/test/jdk/java/net/httpclient/ResponseBodyBeforeError.java b/test/jdk/java/net/httpclient/ResponseBodyBeforeError.java index d1cffff72cf..beed8f86fa6 100644 --- a/test/jdk/java/net/httpclient/ResponseBodyBeforeError.java +++ b/test/jdk/java/net/httpclient/ResponseBodyBeforeError.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -28,7 +28,7 @@ * @modules java.net.http/jdk.internal.net.http.common * @library /test/lib * @build jdk.test.lib.net.SimpleSSLContext - * @run testng/othervm ResponseBodyBeforeError + * @run testng/othervm/timeout=480 ResponseBodyBeforeError */ import java.io.Closeable; diff --git a/test/jdk/java/net/httpclient/ResponsePublisher.java b/test/jdk/java/net/httpclient/ResponsePublisher.java index e8d76430946..3d6cf601b2f 100644 --- a/test/jdk/java/net/httpclient/ResponsePublisher.java +++ b/test/jdk/java/net/httpclient/ResponsePublisher.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -28,7 +28,7 @@ * immediately with a Publisher> * @library /test/lib /test/jdk/java/net/httpclient/lib * @build jdk.test.lib.net.SimpleSSLContext jdk.httpclient.test.lib.common.HttpServerAdapters - * @run testng/othervm ResponsePublisher + * @run testng/othervm/timeout=480 ResponsePublisher */ import com.sun.net.httpserver.HttpExchange; diff --git a/test/jdk/java/net/httpclient/SpecialHeadersTest.java b/test/jdk/java/net/httpclient/SpecialHeadersTest.java index 37cb47a6872..d3e1f37b592 100644 --- a/test/jdk/java/net/httpclient/SpecialHeadersTest.java +++ b/test/jdk/java/net/httpclient/SpecialHeadersTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -31,10 +31,10 @@ * jdk.httpclient.test.lib.http2.Http2TestServer * jdk.test.lib.net.SimpleSSLContext * @requires (vm.compMode != "Xcomp") - * @run testng/othervm + * @run testng/othervm/timeout=480 * -Djdk.httpclient.HttpClient.log=requests,headers,errors * SpecialHeadersTest - * @run testng/othervm -Djdk.httpclient.allowRestrictedHeaders=Host + * @run testng/othervm/timeout=480 -Djdk.httpclient.allowRestrictedHeaders=Host * -Djdk.httpclient.HttpClient.log=requests,headers,errors * SpecialHeadersTest */ diff --git a/test/jdk/java/net/httpclient/SplitResponse.java b/test/jdk/java/net/httpclient/SplitResponse.java index 48f958047b7..ad04e8a1627 100644 --- a/test/jdk/java/net/httpclient/SplitResponse.java +++ b/test/jdk/java/net/httpclient/SplitResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -52,7 +52,7 @@ import static java.net.http.HttpResponse.BodyHandlers.ofString; * @library /test/lib * @build jdk.test.lib.net.SimpleSSLContext * @build MockServer - * @run main/othervm + * @run main/othervm/timeout=480 * -Djdk.internal.httpclient.debug=true * -Djdk.httpclient.HttpClient.log=all * SplitResponse HTTP connection:CLOSE mode:SYNC diff --git a/test/jdk/java/net/httpclient/SplitResponseAsync.java b/test/jdk/java/net/httpclient/SplitResponseAsync.java index caed3dc8d67..dfb3843561a 100644 --- a/test/jdk/java/net/httpclient/SplitResponseAsync.java +++ b/test/jdk/java/net/httpclient/SplitResponseAsync.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,7 +27,7 @@ * @library /test/lib * @build jdk.test.lib.net.SimpleSSLContext * @build MockServer SplitResponse - * @run main/othervm + * @run main/othervm/timeout=480 * -Djdk.internal.httpclient.debug=true * -Djdk.httpclient.HttpClient.log=all * SplitResponse HTTP connection:CLOSE mode:ASYNC diff --git a/test/jdk/java/net/httpclient/SplitResponseKeepAlive.java b/test/jdk/java/net/httpclient/SplitResponseKeepAlive.java index f805f26a1e4..a8477e8b289 100644 --- a/test/jdk/java/net/httpclient/SplitResponseKeepAlive.java +++ b/test/jdk/java/net/httpclient/SplitResponseKeepAlive.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,7 +27,7 @@ * @library /test/lib * @build jdk.test.lib.net.SimpleSSLContext * @build MockServer SplitResponse - * @run main/othervm + * @run main/othervm/timeout=480 * -Djdk.internal.httpclient.debug=true * -Djdk.httpclient.HttpClient.log=all * SplitResponse HTTP connection:KEEP_ALIVE mode:SYNC diff --git a/test/jdk/java/net/httpclient/SplitResponseKeepAliveAsync.java b/test/jdk/java/net/httpclient/SplitResponseKeepAliveAsync.java index c8d034444b6..7d46989f976 100644 --- a/test/jdk/java/net/httpclient/SplitResponseKeepAliveAsync.java +++ b/test/jdk/java/net/httpclient/SplitResponseKeepAliveAsync.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,7 +27,7 @@ * @library /test/lib * @build jdk.test.lib.net.SimpleSSLContext * @build MockServer SplitResponse - * @run main/othervm + * @run main/othervm/timeout=480 * -Djdk.internal.httpclient.debug=true * -Djdk.httpclient.HttpClient.log=all * SplitResponse HTTP connection:KEEP_ALIVE mode:ASYNC diff --git a/test/jdk/java/net/httpclient/SplitResponseSSL.java b/test/jdk/java/net/httpclient/SplitResponseSSL.java index ba030d74efa..31c3f4f8f61 100644 --- a/test/jdk/java/net/httpclient/SplitResponseSSL.java +++ b/test/jdk/java/net/httpclient/SplitResponseSSL.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,7 +27,7 @@ * @library /test/lib * @build jdk.test.lib.net.SimpleSSLContext * @build MockServer SplitResponse - * @run main/othervm + * @run main/othervm/timeout=480 * -Djdk.internal.httpclient.debug=true * -Djdk.httpclient.HttpClient.log=all * SplitResponse HTTPS connection:CLOSE mode:SYNC diff --git a/test/jdk/java/net/httpclient/SplitResponseSSLAsync.java b/test/jdk/java/net/httpclient/SplitResponseSSLAsync.java index e78b6703d59..e54a0314d2d 100644 --- a/test/jdk/java/net/httpclient/SplitResponseSSLAsync.java +++ b/test/jdk/java/net/httpclient/SplitResponseSSLAsync.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,7 +27,7 @@ * @library /test/lib * @build jdk.test.lib.net.SimpleSSLContext * @build MockServer SplitResponse - * @run main/othervm + * @run main/othervm/timeout=480 * -Djdk.internal.httpclient.debug=true * -Djdk.httpclient.HttpClient.log=all * SplitResponse HTTPS connection:CLOSE mode:ASYNC diff --git a/test/jdk/java/net/httpclient/SplitResponseSSLKeepAlive.java b/test/jdk/java/net/httpclient/SplitResponseSSLKeepAlive.java index 9892370cdef..a707c6c3921 100644 --- a/test/jdk/java/net/httpclient/SplitResponseSSLKeepAlive.java +++ b/test/jdk/java/net/httpclient/SplitResponseSSLKeepAlive.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,7 +27,7 @@ * @library /test/lib * @build jdk.test.lib.net.SimpleSSLContext * @build MockServer SplitResponse - * @run main/othervm + * @run main/othervm/timeout=480 * -Djdk.internal.httpclient.debug=true * -Djdk.httpclient.HttpClient.log=all * SplitResponse HTTPS connection:KEEP_ALIVE mode:SYNC diff --git a/test/jdk/java/net/httpclient/SplitResponseSSLKeepAliveAsync.java b/test/jdk/java/net/httpclient/SplitResponseSSLKeepAliveAsync.java index 96dbb5f5bc0..740baabd714 100644 --- a/test/jdk/java/net/httpclient/SplitResponseSSLKeepAliveAsync.java +++ b/test/jdk/java/net/httpclient/SplitResponseSSLKeepAliveAsync.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,7 +27,7 @@ * @library /test/lib * @build jdk.test.lib.net.SimpleSSLContext * @build MockServer SplitResponse - * @run main/othervm + * @run main/othervm/timeout=480 * -Djdk.internal.httpclient.debug=true * -Djdk.httpclient.HttpClient.log=all * SplitResponse HTTPS connection:KEEP_ALIVE mode:ASYNC diff --git a/test/jdk/java/net/httpclient/whitebox/FlowTestDriver.java b/test/jdk/java/net/httpclient/whitebox/FlowTestDriver.java index aea81fb0a0b..a0130de5a67 100644 --- a/test/jdk/java/net/httpclient/whitebox/FlowTestDriver.java +++ b/test/jdk/java/net/httpclient/whitebox/FlowTestDriver.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -24,5 +24,5 @@ /* * @test * @modules java.net.http/jdk.internal.net.http - * @run testng java.net.http/jdk.internal.net.http.FlowTest + * @run testng/timeout=480 java.net.http/jdk.internal.net.http.FlowTest */ diff --git a/test/jdk/java/nio/channels/AsynchronousSocketChannel/StressLoopback.java b/test/jdk/java/nio/channels/AsynchronousSocketChannel/StressLoopback.java index 8f8f816cad6..331da97845a 100644 --- a/test/jdk/java/nio/channels/AsynchronousSocketChannel/StressLoopback.java +++ b/test/jdk/java/nio/channels/AsynchronousSocketChannel/StressLoopback.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,7 +25,7 @@ * @bug 6834246 6842687 * @summary Stress test connections through the loopback interface * @run main StressLoopback - * @run main/othervm -Djdk.net.useFastTcpLoopback StressLoopback + * @run main/othervm/timeout=480 -Djdk.net.useFastTcpLoopback StressLoopback * @key randomness */ diff --git a/test/jdk/java/nio/channels/Channels/TransferTo.java b/test/jdk/java/nio/channels/Channels/TransferTo.java index bc0dc01fdb0..b02bf7b3649 100644 --- a/test/jdk/java/nio/channels/Channels/TransferTo.java +++ b/test/jdk/java/nio/channels/Channels/TransferTo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -47,7 +47,7 @@ import static org.testng.Assert.assertThrows; * @test * @library /test/lib * @build jdk.test.lib.RandomFactory - * @run testng/othervm/timeout=180 TransferTo + * @run testng/othervm/timeout=720 TransferTo * @bug 8265891 * @summary Tests whether sun.nio.ChannelInputStream.transferTo conforms to the * InputStream.transferTo specification diff --git a/test/jdk/java/nio/channels/Channels/TransferTo_2GB_transferFrom.java b/test/jdk/java/nio/channels/Channels/TransferTo_2GB_transferFrom.java index 4829cc63f70..f57d6cca963 100644 --- a/test/jdk/java/nio/channels/Channels/TransferTo_2GB_transferFrom.java +++ b/test/jdk/java/nio/channels/Channels/TransferTo_2GB_transferFrom.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -36,7 +36,7 @@ import org.testng.annotations.Test; * @test * @library /test/lib * @build jdk.test.lib.RandomFactory - * @run testng/othervm/timeout=180 TransferTo_2GB_transferFrom + * @run testng/othervm/timeout=720 TransferTo_2GB_transferFrom * @bug 8278268 * @summary Tests if ChannelInputStream.transferFrom correctly * transfers 2GB+ using FileChannel.transferFrom(ReadableByteChannel). diff --git a/test/jdk/java/nio/channels/Channels/TransferTo_2GB_transferTo.java b/test/jdk/java/nio/channels/Channels/TransferTo_2GB_transferTo.java index 34b4e504b05..fdd3bddb126 100644 --- a/test/jdk/java/nio/channels/Channels/TransferTo_2GB_transferTo.java +++ b/test/jdk/java/nio/channels/Channels/TransferTo_2GB_transferTo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -35,7 +35,7 @@ import org.testng.annotations.Test; * @test * @library /test/lib * @build jdk.test.lib.RandomFactory - * @run testng/othervm/timeout=180 TransferTo_2GB_transferTo + * @run testng/othervm/timeout=720 TransferTo_2GB_transferTo * @bug 8265891 * @summary Tests if ChannelInputStream.transferTo correctly * transfers 2GB+ using FileChannel.transferTo(WritableByteChannel). diff --git a/test/jdk/java/nio/channels/FileChannel/CleanerTest.java b/test/jdk/java/nio/channels/FileChannel/CleanerTest.java index c999684a56d..48b00deabb9 100644 --- a/test/jdk/java/nio/channels/FileChannel/CleanerTest.java +++ b/test/jdk/java/nio/channels/FileChannel/CleanerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -28,7 +28,7 @@ * @library /test/lib * @build jdk.test.lib.util.FileUtils CleanerTest * @modules java.management java.base/sun.nio.ch:+open - * @run main/othervm CleanerTest + * @run main/othervm/timeout=480 CleanerTest */ import com.sun.management.UnixOperatingSystemMXBean; diff --git a/test/jdk/java/nio/channels/SocketChannel/CloseDuringConnect.java b/test/jdk/java/nio/channels/SocketChannel/CloseDuringConnect.java index c42db8f485f..2ec77d97958 100644 --- a/test/jdk/java/nio/channels/SocketChannel/CloseDuringConnect.java +++ b/test/jdk/java/nio/channels/SocketChannel/CloseDuringConnect.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,7 +25,7 @@ * @bug 8198928 * @library /test/lib * @build jdk.test.lib.Utils - * @run main CloseDuringConnect + * @run main/timeout=480 CloseDuringConnect * @summary Attempt to cause a deadlock by closing a SocketChannel in one thread * where another thread is closing the channel after a connect fail */ diff --git a/test/jdk/java/nio/channels/SocketChannel/OpenLeak.java b/test/jdk/java/nio/channels/SocketChannel/OpenLeak.java index c7eed1f27a0..cbfe4c9b7fb 100644 --- a/test/jdk/java/nio/channels/SocketChannel/OpenLeak.java +++ b/test/jdk/java/nio/channels/SocketChannel/OpenLeak.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,7 +27,7 @@ * connection cannot be established * @requires vm.flagless * @build OpenLeak - * @run junit/othervm OpenLeak + * @run junit/othervm/timeout=480 OpenLeak */ import java.io.IOException; diff --git a/test/jdk/java/nio/channels/unixdomain/IOExchanges.java b/test/jdk/java/nio/channels/unixdomain/IOExchanges.java index 96478b2b20f..33a7b5ef3c4 100644 --- a/test/jdk/java/nio/channels/unixdomain/IOExchanges.java +++ b/test/jdk/java/nio/channels/unixdomain/IOExchanges.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -24,7 +24,7 @@ /** * @test * @bug 8245194 - * @run testng/othervm IOExchanges + * @run testng/othervm/timeout=480 IOExchanges */ import java.io.IOException; diff --git a/test/jdk/java/nio/channels/vthread/BlockingChannelOps.java b/test/jdk/java/nio/channels/vthread/BlockingChannelOps.java index 1cdd090d1be..f04bece07b6 100644 --- a/test/jdk/java/nio/channels/vthread/BlockingChannelOps.java +++ b/test/jdk/java/nio/channels/vthread/BlockingChannelOps.java @@ -26,22 +26,22 @@ * @bug 8284161 * @summary Test virtual threads doing blocking I/O on NIO channels * @library /test/lib - * @run junit BlockingChannelOps + * @run junit/timeout=480 BlockingChannelOps */ /* * @test id=poller-modes * @requires (os.family == "linux") | (os.family == "mac") * @library /test/lib - * @run junit/othervm -Djdk.pollerMode=1 BlockingChannelOps - * @run junit/othervm -Djdk.pollerMode=2 BlockingChannelOps + * @run junit/othervm/timeout=480 -Djdk.pollerMode=1 BlockingChannelOps + * @run junit/othervm/timeout=480 -Djdk.pollerMode=2 BlockingChannelOps */ /* * @test id=no-vmcontinuations * @requires vm.continuations * @library /test/lib - * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:-VMContinuations BlockingChannelOps + * @run junit/othervm/timeout=480 -XX:+UnlockExperimentalVMOptions -XX:-VMContinuations BlockingChannelOps */ import java.io.Closeable; diff --git a/test/jdk/java/rmi/transport/dgcDeadLock/DGCDeadLock.java b/test/jdk/java/rmi/transport/dgcDeadLock/DGCDeadLock.java index 2137cfb3721..baa20ff2b9c 100644 --- a/test/jdk/java/rmi/transport/dgcDeadLock/DGCDeadLock.java +++ b/test/jdk/java/rmi/transport/dgcDeadLock/DGCDeadLock.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -34,7 +34,7 @@ * java.rmi/sun.rmi.transport * java.rmi/sun.rmi.transport.tcp * @build TestLibrary Test TestImpl RegistryVM RegistryRunner - * @run main/othervm/timeout=360 DGCDeadLock + * @run main/othervm/timeout=1440 DGCDeadLock */ /* This test attempts to cause a deadlock between the rmi leaseChecker @@ -56,8 +56,7 @@ import java.io.*; public class DGCDeadLock implements Runnable { final static public int HOLD_TARGET_TIME = 25000; - public static final double TEST_FAIL_TIME = - (HOLD_TARGET_TIME + 30000) * TestLibrary.getTimeoutFactor(); + public static final double TEST_FAIL_TIME = (HOLD_TARGET_TIME + 30000) * Math.max(TestLibrary.getTimeoutFactor(), 4); public static volatile boolean finished = false; static final DGCDeadLock test = new DGCDeadLock(); static volatile int registryPort = -1; diff --git a/test/jdk/java/security/SignedObject/Chain.java b/test/jdk/java/security/SignedObject/Chain.java index 883ac13890d..c4b83d1ec5b 100644 --- a/test/jdk/java/security/SignedObject/Chain.java +++ b/test/jdk/java/security/SignedObject/Chain.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -33,7 +33,7 @@ import static jdk.test.lib.SigTestUtil.SignatureType; * @summary Verify a chain of signed objects * @library /test/lib * @build jdk.test.lib.SigTestUtil - * @run main Chain + * @run main/timeout=480 Chain */ public class Chain { diff --git a/test/jdk/java/text/Format/DateFormat/DateFormatTest.java b/test/jdk/java/text/Format/DateFormat/DateFormatTest.java index f0b30fa1065..06cb4fe7df4 100644 --- a/test/jdk/java/text/Format/DateFormat/DateFormatTest.java +++ b/test/jdk/java/text/Format/DateFormat/DateFormatTest.java @@ -27,7 +27,7 @@ * 8190748 8216969 8174269 8347841 8347955 * @summary test DateFormat and SimpleDateFormat. * @modules jdk.localedata - * @run junit DateFormatTest + * @run junit/timeout=480 DateFormatTest */ import java.time.ZoneId; diff --git a/test/jdk/java/util/HashMap/WhiteBoxResizeTest.java b/test/jdk/java/util/HashMap/WhiteBoxResizeTest.java index e517d5570d0..f17d9194c14 100644 --- a/test/jdk/java/util/HashMap/WhiteBoxResizeTest.java +++ b/test/jdk/java/util/HashMap/WhiteBoxResizeTest.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2018, Red Hat, Inc. All rights reserved. - * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -57,7 +57,7 @@ import static org.testng.Assert.assertThrows; * @summary White box tests for HashMap-related internals around table sizing * @comment skip running this test on 32 bit VM * @requires vm.bits == "64" - * @run testng/othervm -Xmx2g WhiteBoxResizeTest + * @run testng/othervm/timeout=960 -Xmx2g WhiteBoxResizeTest */ public class WhiteBoxResizeTest { diff --git a/test/jdk/java/util/PluggableLocale/CurrencyNameProviderTest.java b/test/jdk/java/util/PluggableLocale/CurrencyNameProviderTest.java index bc1df961a57..46bee98a810 100644 --- a/test/jdk/java/util/PluggableLocale/CurrencyNameProviderTest.java +++ b/test/jdk/java/util/PluggableLocale/CurrencyNameProviderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -31,7 +31,7 @@ * java.base/sun.util.resources * @build com.foobar.Utils * com.bar.* - * @run main/othervm -Djava.locale.providers=CLDR,SPI CurrencyNameProviderTest + * @run main/othervm/timeout=480 -Djava.locale.providers=CLDR,SPI CurrencyNameProviderTest */ import java.text.DecimalFormat; diff --git a/test/jdk/java/util/PluggableLocale/LocaleNameProviderTest.java b/test/jdk/java/util/PluggableLocale/LocaleNameProviderTest.java index 9d44dd79c02..fcec85a945b 100644 --- a/test/jdk/java/util/PluggableLocale/LocaleNameProviderTest.java +++ b/test/jdk/java/util/PluggableLocale/LocaleNameProviderTest.java @@ -31,7 +31,7 @@ * java.base/sun.util.resources * @build com.foobar.Utils * com.bar.* - * @run junit/othervm -Djava.locale.providers=CLDR,SPI LocaleNameProviderTest + * @run junit/othervm/timeout=960 -Djava.locale.providers=CLDR,SPI LocaleNameProviderTest */ import java.util.ArrayList; diff --git a/test/jdk/java/util/concurrent/ScheduledThreadPoolExecutor/BasicCancelTest.java b/test/jdk/java/util/concurrent/ScheduledThreadPoolExecutor/BasicCancelTest.java index 5ca755fc362..43490a711b2 100644 --- a/test/jdk/java/util/concurrent/ScheduledThreadPoolExecutor/BasicCancelTest.java +++ b/test/jdk/java/util/concurrent/ScheduledThreadPoolExecutor/BasicCancelTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -24,7 +24,7 @@ /* * @test * @bug 6602600 - * @run main/othervm -Xmx64m BasicCancelTest + * @run main/othervm/timeout=480 -Xmx64m BasicCancelTest * @summary Check effectiveness of RemoveOnCancelPolicy */ diff --git a/test/jdk/java/util/logging/FileHandlerPath.java b/test/jdk/java/util/logging/FileHandlerPath.java index 85ec52a0619..a4d23dbf458 100644 --- a/test/jdk/java/util/logging/FileHandlerPath.java +++ b/test/jdk/java/util/logging/FileHandlerPath.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -39,7 +39,7 @@ import java.util.logging.LogManager; * @bug 8059269 * @summary tests that using a simple (non composite) pattern does not lead * to NPE when the lock file already exists. - * @run main/othervm FileHandlerPath + * @run main/othervm/timeout=480 FileHandlerPath * @author danielfuchs * @key randomness */ diff --git a/test/jdk/java/util/logging/LogManager/Configuration/updateConfiguration/HandlersOnComplexResetUpdate.java b/test/jdk/java/util/logging/LogManager/Configuration/updateConfiguration/HandlersOnComplexResetUpdate.java index f24bb2e22ec..64fd22362ca 100644 --- a/test/jdk/java/util/logging/LogManager/Configuration/updateConfiguration/HandlersOnComplexResetUpdate.java +++ b/test/jdk/java/util/logging/LogManager/Configuration/updateConfiguration/HandlersOnComplexResetUpdate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -40,6 +40,7 @@ import java.util.function.Function; import java.util.logging.FileHandler; import java.util.logging.LogManager; import java.util.logging.Logger; +import jdk.test.lib.Utils; /** * @test @@ -49,6 +50,7 @@ import java.util.logging.Logger; * Test a complex reconfiguration where a logger with handlers * suddenly appears in the hierarchy between a child logger and the * root logger. + * @library /test/lib * @run main/othervm HandlersOnComplexResetUpdate * @author danielfuchs */ @@ -60,13 +62,8 @@ public class HandlersOnComplexResetUpdate { test(properties); } - public static final double TIMEOUT_FACTOR; - static { - String toFactor = System.getProperty("test.timeout.factor", "1.0"); - TIMEOUT_FACTOR = Double.parseDouble(toFactor); - } static int adjustCount(int count) { - return Math.min(count, (int) Math.ceil(TIMEOUT_FACTOR * count)); + return Math.min(count, (int) Math.ceil(Utils.TIMEOUT_FACTOR * count)); } private static final String PREFIX = diff --git a/test/jdk/java/util/logging/LogManager/Configuration/updateConfiguration/HandlersOnComplexUpdate.java b/test/jdk/java/util/logging/LogManager/Configuration/updateConfiguration/HandlersOnComplexUpdate.java index 8735c34aa98..146cfea1af8 100644 --- a/test/jdk/java/util/logging/LogManager/Configuration/updateConfiguration/HandlersOnComplexUpdate.java +++ b/test/jdk/java/util/logging/LogManager/Configuration/updateConfiguration/HandlersOnComplexUpdate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -40,6 +40,7 @@ import java.util.function.Function; import java.util.logging.FileHandler; import java.util.logging.LogManager; import java.util.logging.Logger; +import jdk.test.lib.Utils; /** * @test @@ -49,6 +50,7 @@ import java.util.logging.Logger; * Test a complex reconfiguration where a logger with handlers * suddenly appears in the hierarchy between a child logger and the * root logger. + * @library /test/lib * @run main/othervm HandlersOnComplexUpdate * @author danielfuchs */ @@ -60,13 +62,8 @@ public class HandlersOnComplexUpdate { test(properties); } - public static final double TIMEOUT_FACTOR; - static { - String toFactor = System.getProperty("test.timeout.factor", "1.0"); - TIMEOUT_FACTOR = Double.parseDouble(toFactor); - } static int adjustCount(int count) { - return Math.min(count, (int) Math.ceil(TIMEOUT_FACTOR * count)); + return Math.min(count, (int) Math.ceil(Utils.TIMEOUT_FACTOR * count)); } private static final String PREFIX = diff --git a/test/jdk/java/util/stream/boottest/java.base/java/util/stream/TEST.properties b/test/jdk/java/util/stream/boottest/java.base/java/util/stream/TEST.properties new file mode 100644 index 00000000000..64710ba44a1 --- /dev/null +++ b/test/jdk/java/util/stream/boottest/java.base/java/util/stream/TEST.properties @@ -0,0 +1 @@ +timeout.default.seconds=480 diff --git a/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/TEST.properties b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/TEST.properties new file mode 100644 index 00000000000..64710ba44a1 --- /dev/null +++ b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/TEST.properties @@ -0,0 +1 @@ +timeout.default.seconds=480 diff --git a/test/jdk/java/util/zip/DeInflate.java b/test/jdk/java/util/zip/DeInflate.java index 226d4ed4ae3..83ed417fed1 100644 --- a/test/jdk/java/util/zip/DeInflate.java +++ b/test/jdk/java/util/zip/DeInflate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -24,8 +24,9 @@ /* * @test * @bug 7110149 8184306 6341887 8357145 - * @summary Test basic deflater & inflater functionality + * @summary Test basic deflater and inflater functionality * @key randomness + * @run main/timeout=480 DeInflate */ import java.io.*; diff --git a/test/jdk/java/util/zip/ZipFile/TestZipFileEncodings.java b/test/jdk/java/util/zip/ZipFile/TestZipFileEncodings.java index d8d474ae8d4..4e271912345 100644 --- a/test/jdk/java/util/zip/ZipFile/TestZipFileEncodings.java +++ b/test/jdk/java/util/zip/ZipFile/TestZipFileEncodings.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ * @bug 8243254 * @summary Tests a simple set of operations on Zip files in various encodings * focusing on ensuring metadata is properly encoded and read. - * @run testng TestZipFileEncodings + * @run testng/timeout=480 TestZipFileEncodings */ import org.testng.annotations.AfterClass; import org.testng.annotations.DataProvider; diff --git a/test/jdk/javax/net/ssl/ciphersuites/DisabledAlgorithms.java b/test/jdk/javax/net/ssl/ciphersuites/DisabledAlgorithms.java index 8db1dfdeac8..946951dfc98 100644 --- a/test/jdk/javax/net/ssl/ciphersuites/DisabledAlgorithms.java +++ b/test/jdk/javax/net/ssl/ciphersuites/DisabledAlgorithms.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,8 +27,8 @@ * @summary Check if weak cipher suites are disabled * @library /javax/net/ssl/templates * @modules jdk.crypto.ec - * @run main/othervm DisabledAlgorithms default - * @run main/othervm DisabledAlgorithms empty + * @run main/othervm/timeout=480 DisabledAlgorithms default + * @run main/othervm/timeout=480 DisabledAlgorithms empty */ import java.io.BufferedInputStream; diff --git a/test/jdk/javax/swing/JFileChooser/6868611/bug6868611.java b/test/jdk/javax/swing/JFileChooser/6868611/bug6868611.java index 28ed114b807..07d24115218 100644 --- a/test/jdk/javax/swing/JFileChooser/6868611/bug6868611.java +++ b/test/jdk/javax/swing/JFileChooser/6868611/bug6868611.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ * @bug 6868611 8198004 * @summary FileSystemView throws NullPointerException * @author Pavel Porvatov - * @run main bug6868611 + * @run main/timeout=480 bug6868611 */ import javax.swing.*; diff --git a/test/jdk/javax/swing/plaf/basic/BasicDirectoryModel/ConcurrentModification.java b/test/jdk/javax/swing/plaf/basic/BasicDirectoryModel/ConcurrentModification.java index 0c23ee23b5b..8b4d9ab8e69 100644 --- a/test/jdk/javax/swing/plaf/basic/BasicDirectoryModel/ConcurrentModification.java +++ b/test/jdk/javax/swing/plaf/basic/BasicDirectoryModel/ConcurrentModification.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -42,7 +42,7 @@ import javax.swing.JFileChooser; * @bug 8323670 8307091 8240690 * @requires os.family == "mac" | os.family == "linux" * @summary Verifies thread-safety of BasicDirectoryModel (JFileChooser) - * @run main/othervm -Djava.awt.headless=true ConcurrentModification + * @run main/othervm/timeout=480 -Djava.awt.headless=true ConcurrentModification */ public final class ConcurrentModification extends ThreadGroup { /** Initial number of files. */ diff --git a/test/jdk/javax/swing/text/html/parser/Parser/8078268/bug8078268.java b/test/jdk/javax/swing/text/html/parser/Parser/8078268/bug8078268.java index 0de35fbdaa9..363cb94d924 100644 --- a/test/jdk/javax/swing/text/html/parser/Parser/8078268/bug8078268.java +++ b/test/jdk/javax/swing/text/html/parser/Parser/8078268/bug8078268.java @@ -30,16 +30,18 @@ import javax.swing.SwingUtilities; import javax.swing.text.Document; import javax.swing.text.html.HTMLEditorKit; +import jdk.test.lib.Utils; + import static java.util.concurrent.TimeUnit.MILLISECONDS; /* @test @bug 8078268 @summary javax.swing.text.html.parser.Parser parseScript incorrectly optimized + @library /test/lib @run main bug8078268 */ public class bug8078268 { - private static final float tf = Float.parseFloat(System.getProperty("test.timeout.factor", "1.0")); - private static final long TIMEOUT = 10_000 * (long)tf; + private static final long TIMEOUT = (long) (10_000 * Utils.TIMEOUT_FACTOR); private static final String FILENAME = "slowparse.html"; diff --git a/test/jdk/javax/xml/crypto/dsig/GenerationTests.java b/test/jdk/javax/xml/crypto/dsig/GenerationTests.java index ac24ceb476c..0ecc40a8819 100644 --- a/test/jdk/javax/xml/crypto/dsig/GenerationTests.java +++ b/test/jdk/javax/xml/crypto/dsig/GenerationTests.java @@ -34,7 +34,7 @@ * @build jdk.test.lib.Asserts * @compile -XDignore.symbol.file KeySelectors.java SignatureValidator.java * X509KeySelector.java GenerationTests.java - * @run main/othervm/timeout=300 -Dsun.net.httpserver.nodelay=true GenerationTests + * @run main/othervm/timeout=1200 -Dsun.net.httpserver.nodelay=true GenerationTests * @author Sean Mullan */ diff --git a/test/jdk/jdk/incubator/vector/AddTest.java b/test/jdk/jdk/incubator/vector/AddTest.java index bd11f0092be..8d0d7080c49 100644 --- a/test/jdk/jdk/incubator/vector/AddTest.java +++ b/test/jdk/jdk/incubator/vector/AddTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,6 +25,7 @@ * @test * @modules jdk.incubator.vector * @requires vm.compiler2.enabled + * @run main/timeout=480 AddTest */ import jdk.incubator.vector.FloatVector; diff --git a/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetricsSubgroup.java b/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetricsSubgroup.java index 0587d5a6bfb..53f11f22d79 100644 --- a/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetricsSubgroup.java +++ b/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetricsSubgroup.java @@ -44,7 +44,7 @@ import jtreg.SkippedException; * @library /test/lib * @modules java.base/jdk.internal.platform * @build MetricsMemoryTester - * @run main TestDockerMemoryMetricsSubgroup + * @run main/timeout=480 TestDockerMemoryMetricsSubgroup */ public class TestDockerMemoryMetricsSubgroup { diff --git a/test/jdk/jdk/internal/platform/docker/TestGetFreeSwapSpaceSize.java b/test/jdk/jdk/internal/platform/docker/TestGetFreeSwapSpaceSize.java index b9d031f0309..dc70fe32b16 100644 --- a/test/jdk/jdk/internal/platform/docker/TestGetFreeSwapSpaceSize.java +++ b/test/jdk/jdk/internal/platform/docker/TestGetFreeSwapSpaceSize.java @@ -1,6 +1,6 @@ /* * Copyright (C) 2020, 2022, Tencent. All rights reserved. - * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -30,7 +30,7 @@ * @requires !vm.asan * @library /test/lib * @build GetFreeSwapSpaceSize - * @run driver TestGetFreeSwapSpaceSize + * @run driver/timeout=480 TestGetFreeSwapSpaceSize */ import jdk.test.lib.containers.docker.Common; import jdk.test.lib.containers.docker.DockerRunOptions; diff --git a/test/jdk/jdk/internal/platform/docker/TestLimitsUpdating.java b/test/jdk/jdk/internal/platform/docker/TestLimitsUpdating.java index 31e90e8802a..e4decb7f903 100644 --- a/test/jdk/jdk/internal/platform/docker/TestLimitsUpdating.java +++ b/test/jdk/jdk/internal/platform/docker/TestLimitsUpdating.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2023, Red Hat, Inc. - * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved. * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -34,7 +34,7 @@ * @library /test/lib * @modules java.base/jdk.internal.platform * @build LimitUpdateChecker - * @run driver TestLimitsUpdating + * @run driver/timeout=480 TestLimitsUpdating */ import java.io.File; diff --git a/test/jdk/jdk/internal/platform/docker/TestPidsLimit.java b/test/jdk/jdk/internal/platform/docker/TestPidsLimit.java index 6b19bb475f1..033562b3951 100644 --- a/test/jdk/jdk/internal/platform/docker/TestPidsLimit.java +++ b/test/jdk/jdk/internal/platform/docker/TestPidsLimit.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2021 SAP SE. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -31,7 +31,7 @@ * @requires !vm.asan * @library /test/lib * @build TestPidsLimit - * @run driver TestPidsLimit + * @run driver/timeout=480 TestPidsLimit */ import java.util.ArrayList; import java.util.List; diff --git a/test/jdk/jdk/internal/vm/Continuation/BasicExt.java b/test/jdk/jdk/internal/vm/Continuation/BasicExt.java index 530bcb54f34..254583bf18b 100644 --- a/test/jdk/jdk/internal/vm/Continuation/BasicExt.java +++ b/test/jdk/jdk/internal/vm/Continuation/BasicExt.java @@ -153,7 +153,7 @@ * @build jdk.test.whitebox.WhiteBox * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox * - * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+ShowHiddenFrames -XX:+WhiteBoxAPI -Xbootclasspath/a:. + * @run main/othervm/timeout=480 -XX:+UnlockDiagnosticVMOptions -XX:+ShowHiddenFrames -XX:+WhiteBoxAPI -Xbootclasspath/a:. * -Xbatch -XX:-TieredCompilation * -XX:CompileCommand=dontinline,*::*dontinline* * -XX:CompileCommand=dontinline,*::*dontjit* @@ -173,7 +173,7 @@ * @build jdk.test.whitebox.WhiteBox * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox * - * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+ShowHiddenFrames -XX:+WhiteBoxAPI -Xbootclasspath/a:. + * @run main/othervm/timeout=480 -XX:+UnlockDiagnosticVMOptions -XX:+ShowHiddenFrames -XX:+WhiteBoxAPI -Xbootclasspath/a:. * -Xbatch -XX:-TieredCompilation * -XX:CompileCommand=dontinline,*::*dontinline* * -XX:CompileCommand=dontinline,*::*dontjit* @@ -193,7 +193,7 @@ * @build jdk.test.whitebox.WhiteBox * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox * - * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+ShowHiddenFrames -XX:+WhiteBoxAPI -Xbootclasspath/a:. + * @run main/othervm/timeout=480 -XX:+UnlockDiagnosticVMOptions -XX:+ShowHiddenFrames -XX:+WhiteBoxAPI -Xbootclasspath/a:. * -Xbatch -XX:-TieredCompilation * -XX:CompileCommand=dontinline,*::*dontinline* * -XX:CompileCommand=dontinline,*::*dontjit* diff --git a/test/jdk/jdk/internal/vm/Continuation/Fuzz.java b/test/jdk/jdk/internal/vm/Continuation/Fuzz.java index 5f4f8c85f61..8d522cc83e1 100644 --- a/test/jdk/jdk/internal/vm/Continuation/Fuzz.java +++ b/test/jdk/jdk/internal/vm/Continuation/Fuzz.java @@ -34,8 +34,8 @@ * @build jdk.test.whitebox.WhiteBox * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox * - * @run main/othervm/timeout=300 -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. - * Fuzz + * @run main/othervm/timeout=1200 -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. + * Fuzz */ /* @@ -51,9 +51,9 @@ * @build jdk.test.whitebox.WhiteBox * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox * - * @run main/othervm/timeout=300 -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. - * -XX:+PreserveFramePointer - * Fuzz + * @run main/othervm/timeout=1200 -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. + * -XX:+PreserveFramePointer + * Fuzz */ import jdk.internal.vm.Continuation; @@ -84,8 +84,7 @@ public class Fuzz implements Runnable { static final boolean RANDOM = true; static final boolean VERBOSE = false; - static float timeoutFactor = Float.parseFloat(System.getProperty("test.timeout.factor", "1.0")); - static int COMPILATION_TIMEOUT = (int)(5_000 * timeoutFactor); // ms + static int COMPILATION_TIMEOUT = (int)(5_000 * Utils.TIMEOUT_FACTOR); // ms static final Path TEST_DIR = Path.of(System.getProperty("test.src", ".")); diff --git a/test/jdk/jdk/jfr/api/consumer/recordingstream/TestClose.java b/test/jdk/jdk/jfr/api/consumer/recordingstream/TestClose.java index c7e6c6e5922..512f6b39ef9 100644 --- a/test/jdk/jdk/jfr/api/consumer/recordingstream/TestClose.java +++ b/test/jdk/jdk/jfr/api/consumer/recordingstream/TestClose.java @@ -38,7 +38,7 @@ import jdk.jfr.consumer.RecordingStream; * @requires vm.flagless * @requires vm.hasJFR * @library /test/lib /test/jdk - * @run main/othervm -Xlog:jfr+streaming+system=trace jdk.jfr.api.consumer.recordingstream.TestClose + * @run main/othervm/timeout=480 -Xlog:jfr+streaming+system=trace jdk.jfr.api.consumer.recordingstream.TestClose */ public class TestClose { diff --git a/test/jdk/jdk/jfr/api/metadata/annotations/TestStackFilter.java b/test/jdk/jdk/jfr/api/metadata/annotations/TestStackFilter.java index b7c3a67ae68..43abc9cefff 100644 --- a/test/jdk/jdk/jfr/api/metadata/annotations/TestStackFilter.java +++ b/test/jdk/jdk/jfr/api/metadata/annotations/TestStackFilter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -51,7 +51,7 @@ import jdk.test.lib.jfr.TestClassLoader; * @requires vm.hasJFR * @modules jdk.jfr/jdk.jfr.events * @library /test/lib /test/jdk - * @run main/othervm -Xlog:jfr=warning jdk.jfr.api.metadata.annotations.TestStackFilter + * @run main/othervm/timeout=480 -Xlog:jfr=warning jdk.jfr.api.metadata.annotations.TestStackFilter */ public class TestStackFilter { private static class Quux { diff --git a/test/jdk/jdk/jfr/event/oldobject/TestEmergencyDumpAtOOM.java b/test/jdk/jdk/jfr/event/oldobject/TestEmergencyDumpAtOOM.java index a86229c65e3..fd09db01482 100644 --- a/test/jdk/jdk/jfr/event/oldobject/TestEmergencyDumpAtOOM.java +++ b/test/jdk/jdk/jfr/event/oldobject/TestEmergencyDumpAtOOM.java @@ -44,7 +44,7 @@ import jdk.test.lib.process.ProcessTools; * @requires vm.flagless * @requires vm.hasJFR * @library /test/lib -* @run main/othervm jdk.jfr.event.oldobject.TestEmergencyDumpAtOOM +* @run main/othervm/timeout=480 jdk.jfr.event.oldobject.TestEmergencyDumpAtOOM */ public class TestEmergencyDumpAtOOM { diff --git a/test/jdk/jdk/jfr/event/oldobject/TestObjectDescription.java b/test/jdk/jdk/jfr/event/oldobject/TestObjectDescription.java index 60f85e6ba72..56f48a810c3 100644 --- a/test/jdk/jdk/jfr/event/oldobject/TestObjectDescription.java +++ b/test/jdk/jdk/jfr/event/oldobject/TestObjectDescription.java @@ -46,7 +46,7 @@ import jdk.test.lib.jfr.Events; * @comment Marked as flagless until JDK-8344015 is fixed * @library /test/lib /test/jdk * @modules jdk.jfr/jdk.jfr.internal.test - * @run main/othervm -XX:TLABSize=2k jdk.jfr.event.oldobject.TestObjectDescription + * @run main/othervm/timeout=960 -XX:TLABSize=2k jdk.jfr.event.oldobject.TestObjectDescription */ public class TestObjectDescription { diff --git a/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleMultipleRecordings.java b/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleMultipleRecordings.java index 133df36684c..976d08f1250 100644 --- a/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleMultipleRecordings.java +++ b/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleMultipleRecordings.java @@ -36,7 +36,7 @@ import jdk.test.lib.jfr.EventNames; * @requires vm.hasJFR & os.family == "linux" * @library /test/lib * @modules jdk.jfr/jdk.jfr.internal - * @run main jdk.jfr.event.profiling.TestCPUTimeSampleMultipleRecordings + * @run main/timeout=480 jdk.jfr.event.profiling.TestCPUTimeSampleMultipleRecordings */ public class TestCPUTimeSampleMultipleRecordings { diff --git a/test/jdk/jdk/jfr/jvm/TestModularImage.java b/test/jdk/jdk/jfr/jvm/TestModularImage.java index fe49b460f18..41e8dc0fa5b 100644 --- a/test/jdk/jdk/jfr/jvm/TestModularImage.java +++ b/test/jdk/jdk/jfr/jvm/TestModularImage.java @@ -49,7 +49,7 @@ import jdk.test.lib.process.ProcessTools; * module java.base to add java.lang.JTRegModuleHelper. If then a * jlink run is attempted in-process - using the ToolProvider API - * on a JEP 493 enabled JDK, the test fails. - * @run main/othervm jdk.jfr.jvm.TestModularImage + * @run main/othervm/timeout=480 jdk.jfr.jvm.TestModularImage */ public class TestModularImage { private static final String STARTED_RECORDING = "Started recording"; diff --git a/test/jdk/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java b/test/jdk/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java index b4291645007..2dc2b2b4587 100644 --- a/test/jdk/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java +++ b/test/jdk/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java @@ -35,6 +35,7 @@ import java.util.concurrent.Semaphore; import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.Utils; import sun.jvmstat.monitor.MonitorException; import sun.jvmstat.monitor.MonitoredHost; import sun.jvmstat.monitor.MonitoredVm; diff --git a/test/jdk/sun/nio/ch/TestMaxCachedBufferSize.java b/test/jdk/sun/nio/ch/TestMaxCachedBufferSize.java index ef73a15256a..986fc338c71 100644 --- a/test/jdk/sun/nio/ch/TestMaxCachedBufferSize.java +++ b/test/jdk/sun/nio/ch/TestMaxCachedBufferSize.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -44,11 +44,11 @@ import jdk.test.lib.RandomFactory; * @modules java.management * @library /test/lib * @build TestMaxCachedBufferSize - * @run main/othervm/timeout=150 TestMaxCachedBufferSize - * @run main/othervm/timeout=150 -Djdk.nio.maxCachedBufferSize=0 TestMaxCachedBufferSize - * @run main/othervm/timeout=150 -Djdk.nio.maxCachedBufferSize=2000 TestMaxCachedBufferSize - * @run main/othervm/timeout=150 -Djdk.nio.maxCachedBufferSize=100000 TestMaxCachedBufferSize - * @run main/othervm/timeout=150 -Djdk.nio.maxCachedBufferSize=10000000 TestMaxCachedBufferSize + * @run main/othervm/timeout=600 TestMaxCachedBufferSize + * @run main/othervm/timeout=600 -Djdk.nio.maxCachedBufferSize=0 TestMaxCachedBufferSize + * @run main/othervm/timeout=600 -Djdk.nio.maxCachedBufferSize=2000 TestMaxCachedBufferSize + * @run main/othervm/timeout=600 -Djdk.nio.maxCachedBufferSize=100000 TestMaxCachedBufferSize + * @run main/othervm/timeout=600 -Djdk.nio.maxCachedBufferSize=10000000 TestMaxCachedBufferSize * @summary Test the implementation of the jdk.nio.maxCachedBufferSize property * (use -Dseed=X to set PRNG seed) * @key randomness diff --git a/test/jdk/sun/nio/cs/TestEncoderReplaceUTF16.java b/test/jdk/sun/nio/cs/TestEncoderReplaceUTF16.java index c61e85d6698..a93dac16ab6 100644 --- a/test/jdk/sun/nio/cs/TestEncoderReplaceUTF16.java +++ b/test/jdk/sun/nio/cs/TestEncoderReplaceUTF16.java @@ -45,8 +45,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; * @modules java.base/jdk.internal.access * java.base/sun.nio.cs * @build TestEncoderReplaceLatin1 - * @run junit/timeout=10 TestEncoderReplaceUTF16 - * @run junit/timeout=10/othervm -XX:-CompactStrings TestEncoderReplaceUTF16 + * @run junit/timeout=40 TestEncoderReplaceUTF16 + * @run junit/timeout=40/othervm -XX:-CompactStrings TestEncoderReplaceUTF16 */ class TestEncoderReplaceUTF16 { diff --git a/test/jdk/sun/security/ec/ed/EdDSATest.java b/test/jdk/sun/security/ec/ed/EdDSATest.java index c154bca4252..bebb9d2359e 100644 --- a/test/jdk/sun/security/ec/ed/EdDSATest.java +++ b/test/jdk/sun/security/ec/ed/EdDSATest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -57,7 +57,7 @@ import java.util.HexFormat; * @summary Test Signature with variation of serialized EDDSA Keys. * @library /test/lib * @build jdk.test.lib.Convert - * @run main EdDSATest + * @run main/timeout=480 EdDSATest */ public class EdDSATest { diff --git a/test/jdk/sun/security/krb5/config/IncludeRandom.java b/test/jdk/sun/security/krb5/config/IncludeRandom.java index fe05917fd4c..5ee0e485d82 100644 --- a/test/jdk/sun/security/krb5/config/IncludeRandom.java +++ b/test/jdk/sun/security/krb5/config/IncludeRandom.java @@ -27,7 +27,7 @@ * @summary Support "include" anywhere * @modules java.security.jgss/sun.security.krb5 * @library /test/lib - * @run main/othervm IncludeRandom + * @run main/othervm/timeout=480 IncludeRandom */ import jdk.test.lib.Asserts; import jdk.test.lib.security.SeededSecureRandom; diff --git a/test/jdk/sun/security/krb5/name/Constructors.java b/test/jdk/sun/security/krb5/name/Constructors.java index 733a9e421f8..d2b04726bb1 100644 --- a/test/jdk/sun/security/krb5/name/Constructors.java +++ b/test/jdk/sun/security/krb5/name/Constructors.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,7 +25,7 @@ * @bug 6966259 * @summary Make PrincipalName and Realm immutable * @modules java.security.jgss/sun.security.krb5 - * @run main/othervm Constructors + * @run main/othervm/timeout=480 Constructors */ import java.util.Arrays; diff --git a/test/jdk/sun/security/pkcs11/KDF/TestHKDF.java b/test/jdk/sun/security/pkcs11/KDF/TestHKDF.java index aaaa8373f44..5cf0491cd7d 100644 --- a/test/jdk/sun/security/pkcs11/KDF/TestHKDF.java +++ b/test/jdk/sun/security/pkcs11/KDF/TestHKDF.java @@ -43,7 +43,7 @@ import java.util.List; * @bug 8328119 * @summary test HKDF key derivation in SunPKCS11 * @library /test/lib .. - * @run main/othervm/timeout=30 TestHKDF + * @run main/othervm/timeout=120 TestHKDF */ public final class TestHKDF extends PKCS11Test { diff --git a/test/jdk/sun/security/pkcs11/KeyPairGenerator/TestDefaultSize.java b/test/jdk/sun/security/pkcs11/KeyPairGenerator/TestDefaultSize.java index a359ff7a13c..cee8f235f9f 100644 --- a/test/jdk/sun/security/pkcs11/KeyPairGenerator/TestDefaultSize.java +++ b/test/jdk/sun/security/pkcs11/KeyPairGenerator/TestDefaultSize.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -29,7 +29,7 @@ * @library /test/lib .. * @modules java.base/sun.security.util * jdk.crypto.cryptoki - * @run main TestDefaultSize + * @run main/timeout=480 TestDefaultSize */ import java.security.InvalidParameterException; diff --git a/test/jdk/sun/security/pkcs11/KeyStore/ImportKeyToP12.java b/test/jdk/sun/security/pkcs11/KeyStore/ImportKeyToP12.java index 395fe416858..0e8cb36659f 100644 --- a/test/jdk/sun/security/pkcs11/KeyStore/ImportKeyToP12.java +++ b/test/jdk/sun/security/pkcs11/KeyStore/ImportKeyToP12.java @@ -42,7 +42,7 @@ import javax.crypto.spec.SecretKeySpec; * applied to PKCS #12 keystores * @library /test/lib .. * @modules java.base/sun.security.util - * @run main/othervm/timeout=30 ImportKeyToP12 + * @run main/othervm/timeout=120 ImportKeyToP12 */ public final class ImportKeyToP12 extends PKCS11Test { diff --git a/test/jdk/sun/security/pkcs11/Mac/TestLargeSecretKeys.java b/test/jdk/sun/security/pkcs11/Mac/TestLargeSecretKeys.java index dc263cfdb2b..948270d10d9 100644 --- a/test/jdk/sun/security/pkcs11/Mac/TestLargeSecretKeys.java +++ b/test/jdk/sun/security/pkcs11/Mac/TestLargeSecretKeys.java @@ -31,7 +31,7 @@ import java.security.Provider; * @test * @bug 8328556 * @library /test/lib .. - * @run main/othervm/timeout=30 -DCUSTOM_P11_CONFIG_NAME=p11-nss-sensitive.txt TestLargeSecretKeys + * @run main/othervm/timeout=120 -DCUSTOM_P11_CONFIG_NAME=p11-nss-sensitive.txt TestLargeSecretKeys */ public final class TestLargeSecretKeys extends PKCS11Test { diff --git a/test/jdk/sun/security/pkcs12/KeytoolOpensslInteropTest.java b/test/jdk/sun/security/pkcs12/KeytoolOpensslInteropTest.java index facdbc8a187..4974ba06649 100644 --- a/test/jdk/sun/security/pkcs12/KeytoolOpensslInteropTest.java +++ b/test/jdk/sun/security/pkcs12/KeytoolOpensslInteropTest.java @@ -36,7 +36,7 @@ * @modules java.base/sun.security.pkcs * java.base/sun.security.util * @library /test/lib /sun/security/pkcs11/ - * @run main/othervm KeytoolOpensslInteropTest true + * @run main/othervm/timeout=480 KeytoolOpensslInteropTest true */ /* @@ -48,7 +48,7 @@ * @modules java.base/sun.security.pkcs * java.base/sun.security.util * @library /test/lib /sun/security/pkcs11/ - * @run main/othervm KeytoolOpensslInteropTest false + * @run main/othervm/timeout=480 KeytoolOpensslInteropTest false */ import jdk.test.lib.Asserts; diff --git a/test/jdk/sun/security/provider/acvp/Launcher.java b/test/jdk/sun/security/provider/acvp/Launcher.java index c07b7929d89..f420b61d6f4 100644 --- a/test/jdk/sun/security/provider/acvp/Launcher.java +++ b/test/jdk/sun/security/provider/acvp/Launcher.java @@ -37,7 +37,7 @@ import java.util.zip.ZipFile; * @bug 8342442 8345057 * @library /test/lib * @modules java.base/sun.security.provider - * @run main Launcher + * @run main/timeout=480 Launcher */ /* @@ -46,7 +46,7 @@ import java.util.zip.ZipFile; * @bug 8342442 8345057 * @library /test/lib * @modules java.base/sun.security.provider - * @run main/othervm -Xcomp Launcher + * @run main/othervm/timeout=480 -Xcomp Launcher */ /// This test runs on `internalProjection.json`-style files generated by NIST's diff --git a/test/jdk/sun/security/ssl/SSLSocketImpl/SSLSocketCloseHang.java b/test/jdk/sun/security/ssl/SSLSocketImpl/SSLSocketCloseHang.java index 3f69ae2d120..75a790bfd27 100644 --- a/test/jdk/sun/security/ssl/SSLSocketImpl/SSLSocketCloseHang.java +++ b/test/jdk/sun/security/ssl/SSLSocketImpl/SSLSocketCloseHang.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,6 +25,7 @@ * @test * @bug 8184328 8253368 8260923 * @summary JDK8u131-b34-socketRead0 hang at SSL read + * @library /test/lib * @run main/othervm SSLSocketCloseHang TLSv1.2 * @run main/othervm SSLSocketCloseHang TLSv1.2 shutdownInput * @run main/othervm SSLSocketCloseHang TLSv1.2 shutdownOutput @@ -39,6 +40,7 @@ import java.net.*; import java.util.*; import java.security.*; import javax.net.ssl.*; +import jdk.test.lib.Utils; public class SSLSocketCloseHang { /* @@ -137,8 +139,7 @@ public class SSLSocketCloseHang { System.out.println("server ready"); Socket baseSocket = new Socket("localhost", serverPort); - float timeoutFactor = Float.parseFloat(System.getProperty("test.timeout.factor", "1.0")); - baseSocket.setSoTimeout((int)(1000 * timeoutFactor)); + baseSocket.setSoTimeout((int)(1000 * Utils.TIMEOUT_FACTOR)); SSLSocketFactory sslsf = (SSLSocketFactory) SSLSocketFactory.getDefault(); diff --git a/test/jdk/sun/security/ssl/X509KeyManager/CertChecking.java b/test/jdk/sun/security/ssl/X509KeyManager/CertChecking.java index 81e16b925fc..a6963e314f3 100644 --- a/test/jdk/sun/security/ssl/X509KeyManager/CertChecking.java +++ b/test/jdk/sun/security/ssl/X509KeyManager/CertChecking.java @@ -62,10 +62,10 @@ import sun.security.x509.X500Name; * @modules java.base/sun.security.x509 * java.base/sun.security.util * @library /test/lib - * @run main/othervm CertChecking false SunX509 - * @run main/othervm CertChecking true SunX509 - * @run main/othervm CertChecking false PKIX - * @run main/othervm CertChecking true PKIX + * @run main/othervm/timeout=480 CertChecking false SunX509 + * @run main/othervm/timeout=480 CertChecking true SunX509 + * @run main/othervm/timeout=480 CertChecking false PKIX + * @run main/othervm/timeout=480 CertChecking true PKIX */ /* diff --git a/test/jdk/sun/security/tools/jarsigner/ConciseJarsigner.java b/test/jdk/sun/security/tools/jarsigner/ConciseJarsigner.java index e81a25712a6..ef440cb3358 100644 --- a/test/jdk/sun/security/tools/jarsigner/ConciseJarsigner.java +++ b/test/jdk/sun/security/tools/jarsigner/ConciseJarsigner.java @@ -26,7 +26,7 @@ * @bug 6802846 8172529 8227758 8260960 * @summary jarsigner needs enhanced cert validation(options) * @library /test/lib - * @run main/timeout=240 ConciseJarsigner + * @run main/timeout=960 ConciseJarsigner */ import jdk.test.lib.Asserts; diff --git a/test/jdk/sun/security/tools/jarsigner/InsufficientSectionDelimiter.java b/test/jdk/sun/security/tools/jarsigner/InsufficientSectionDelimiter.java index 4c201a6baf3..dbc0ec1d203 100644 --- a/test/jdk/sun/security/tools/jarsigner/InsufficientSectionDelimiter.java +++ b/test/jdk/sun/security/tools/jarsigner/InsufficientSectionDelimiter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -44,7 +44,7 @@ import static java.nio.charset.StandardCharsets.UTF_8; * @test * @bug 8217375 * @library /test/lib - * @run testng InsufficientSectionDelimiter + * @run testng/timeout=480 InsufficientSectionDelimiter * @summary Checks some cases signing a jar the manifest of which has no or * only one line break at the end and no proper delimiting blank line does not * result in an invalid signed jar without jarsigner noticing and failing. diff --git a/test/jdk/sun/security/tools/jarsigner/RestrictedAlgo.java b/test/jdk/sun/security/tools/jarsigner/RestrictedAlgo.java index 65fb1374bdc..46a787f7798 100644 --- a/test/jdk/sun/security/tools/jarsigner/RestrictedAlgo.java +++ b/test/jdk/sun/security/tools/jarsigner/RestrictedAlgo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -39,8 +39,8 @@ import jdk.test.lib.process.OutputAnalyzer; * key sizes, with and without entries in jdk.jar.disabledAlgorithms, * jdk.certpath.disabledAlgorithms * @library /test/lib - * @run main/othervm RestrictedAlgo RESTRICT - * @run main/othervm RestrictedAlgo NO_RESTRICT + * @run main/othervm/timeout=480 RestrictedAlgo RESTRICT + * @run main/othervm/timeout=480 RestrictedAlgo NO_RESTRICT */ public class RestrictedAlgo { diff --git a/test/jdk/sun/security/tools/jarsigner/SectionNameContinuedVsLineBreak.java b/test/jdk/sun/security/tools/jarsigner/SectionNameContinuedVsLineBreak.java index 4464314bf28..d17b2743857 100644 --- a/test/jdk/sun/security/tools/jarsigner/SectionNameContinuedVsLineBreak.java +++ b/test/jdk/sun/security/tools/jarsigner/SectionNameContinuedVsLineBreak.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -43,7 +43,7 @@ import static java.nio.charset.StandardCharsets.UTF_8; * @bug 8217375 8267319 * @library /test/lib * @modules jdk.jartool/jdk.security.jarsigner - * @run testng SectionNameContinuedVsLineBreak + * @run testng/timeout=480 SectionNameContinuedVsLineBreak * @summary Checks some specific line break character sequences in section name * continuation line breaks. */ diff --git a/test/jdk/sun/security/tools/jarsigner/TimestampCheck.java b/test/jdk/sun/security/tools/jarsigner/TimestampCheck.java index 1c81543e435..889ff3208e4 100644 --- a/test/jdk/sun/security/tools/jarsigner/TimestampCheck.java +++ b/test/jdk/sun/security/tools/jarsigner/TimestampCheck.java @@ -75,7 +75,7 @@ import sun.security.timestamp.TimestampToken; * jdk.test.lib.Platform * jdk.test.lib.process.* * @compile -XDignore.symbol.file TimestampCheck.java - * @run main/timeout=600 TimestampCheck + * @run main/timeout=2400 TimestampCheck */ public class TimestampCheck { diff --git a/test/jdk/sun/security/tools/keytool/GenerateAll.java b/test/jdk/sun/security/tools/keytool/GenerateAll.java index 5435372cdcf..e9a653eabe9 100644 --- a/test/jdk/sun/security/tools/keytool/GenerateAll.java +++ b/test/jdk/sun/security/tools/keytool/GenerateAll.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,7 +27,7 @@ * @summary keytool and jarsigner for all algorithms * @library /test/lib * @modules java.base/sun.security.util - * @run testng/timeout=300 GenerateAll + * @run testng/timeout=1200 GenerateAll */ import jdk.test.lib.SecurityTools; diff --git a/test/jdk/sun/security/tools/keytool/ReadJar.java b/test/jdk/sun/security/tools/keytool/ReadJar.java index 97c65e1fb3b..00f6c7b3f8c 100644 --- a/test/jdk/sun/security/tools/keytool/ReadJar.java +++ b/test/jdk/sun/security/tools/keytool/ReadJar.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -34,7 +34,7 @@ * jdk.test.lib.JDKToolLauncher * jdk.test.lib.Platform * jdk.test.lib.process.* - * @run main ReadJar + * @run main/timeout=480 ReadJar */ import java.nio.file.Files; diff --git a/test/jdk/sun/security/tools/keytool/fakecacerts/TrustedCert.java b/test/jdk/sun/security/tools/keytool/fakecacerts/TrustedCert.java index c90b3f37eaa..5c0694887fd 100644 --- a/test/jdk/sun/security/tools/keytool/fakecacerts/TrustedCert.java +++ b/test/jdk/sun/security/tools/keytool/fakecacerts/TrustedCert.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -30,7 +30,7 @@ * @build java.base/sun.security.util.FilePaths * @modules java.base/sun.security.util * java.base/jdk.internal.misc - * @run main TrustedCert + * @run main/timeout=480 TrustedCert */ import jdk.test.lib.SecurityTools; diff --git a/test/jdk/sun/tools/jcmd/TestJcmdSanity.java b/test/jdk/sun/tools/jcmd/TestJcmdSanity.java index 017392565dd..92f73597ce6 100644 --- a/test/jdk/sun/tools/jcmd/TestJcmdSanity.java +++ b/test/jdk/sun/tools/jcmd/TestJcmdSanity.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -43,7 +43,7 @@ import jdk.test.lib.Utils; * * @library /test/lib * - * @run main/othervm -XX:+UsePerfData TestJcmdSanity + * @run main/othervm/timeout=480 -XX:+UsePerfData TestJcmdSanity */ public class TestJcmdSanity { diff --git a/test/jdk/sun/util/resources/TimeZone/Bug8139107.java b/test/jdk/sun/util/resources/TimeZone/Bug8139107.java index 1320d228793..3a65569ad98 100644 --- a/test/jdk/sun/util/resources/TimeZone/Bug8139107.java +++ b/test/jdk/sun/util/resources/TimeZone/Bug8139107.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,7 +27,7 @@ * @summary Test that date parsing with DateTimeFormatter pattern * that contains timezone field doesn't trigger NPE. All supported * locales are tested. - * @run testng Bug8139107 + * @run testng/timeout=480 Bug8139107 */ import java.time.format.DateTimeFormatter; import java.util.Locale; @@ -56,4 +56,3 @@ public class Bug8139107 { // Pattern with time zone field static final String pattern = "dd-MM-yyyy HH:mm:ss z"; } - diff --git a/test/jdk/tools/jlink/JLink100Modules.java b/test/jdk/tools/jlink/JLink100Modules.java index 1ce63aec9e6..7927a2de2b4 100644 --- a/test/jdk/tools/jlink/JLink100Modules.java +++ b/test/jdk/tools/jlink/JLink100Modules.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -42,7 +42,7 @@ import tests.JImageGenerator; * jdk.jlink/jdk.tools.jimage * jdk.compiler * @build tests.* - * @run main/othervm -Xmx1g -Xlog:init=debug -XX:+UnlockDiagnosticVMOptions -XX:+BytecodeVerificationLocal JLink100Modules + * @run main/othervm/timeout=480 -Xmx1g -Xlog:init=debug -XX:+UnlockDiagnosticVMOptions -XX:+BytecodeVerificationLocal JLink100Modules */ public class JLink100Modules { private static final ToolProvider JAVAC_TOOL = ToolProvider.findFirst("javac") diff --git a/test/jdk/tools/jlink/JLink20000Packages.java b/test/jdk/tools/jlink/JLink20000Packages.java index 865cf7ca98c..d592cbc112b 100644 --- a/test/jdk/tools/jlink/JLink20000Packages.java +++ b/test/jdk/tools/jlink/JLink20000Packages.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -45,7 +45,7 @@ import tests.JImageGenerator; * jdk.jlink/jdk.tools.jimage * jdk.compiler * @build tests.* - * @run main/othervm -Xmx1g -Xlog:init=debug -XX:+UnlockDiagnosticVMOptions -XX:+BytecodeVerificationLocal JLink20000Packages + * @run main/othervm/timeout=1920 -Xmx1g -Xlog:init=debug -XX:+UnlockDiagnosticVMOptions -XX:+BytecodeVerificationLocal JLink20000Packages */ public class JLink20000Packages { private static final ToolProvider JAVAC_TOOL = ToolProvider.findFirst("javac") diff --git a/test/jdk/tools/jlink/JLinkTest.java b/test/jdk/tools/jlink/JLinkTest.java index 0b7de201ac9..bc4d2a08800 100644 --- a/test/jdk/tools/jlink/JLinkTest.java +++ b/test/jdk/tools/jlink/JLinkTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -55,7 +55,7 @@ import tests.JImageGenerator; * jdk.jlink/jdk.tools.jimage * jdk.compiler * @build tests.* - * @run main/othervm -Xmx1g JLinkTest + * @run main/othervm/timeout=480 -Xmx1g JLinkTest */ public class JLinkTest { static final ToolProvider JLINK_TOOL = ToolProvider.findFirst("jlink") diff --git a/test/jdk/tools/jlink/plugins/IncludeLocalesPluginTest.java b/test/jdk/tools/jlink/plugins/IncludeLocalesPluginTest.java index 008b4a175a9..d2c3f2800a8 100644 --- a/test/jdk/tools/jlink/plugins/IncludeLocalesPluginTest.java +++ b/test/jdk/tools/jlink/plugins/IncludeLocalesPluginTest.java @@ -68,7 +68,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; * @build tests.* * @build jdk.test.lib.Platform * @build tools.jlink.plugins.GetAvailableLocales - * @run junit/othervm/timeout=180 -Xmx1g IncludeLocalesPluginTest + * @run junit/othervm/timeout=720 -Xmx1g IncludeLocalesPluginTest */ public class IncludeLocalesPluginTest { diff --git a/test/jdk/tools/jlink/runtimeImage/JavaSEReproducibleTest.java b/test/jdk/tools/jlink/runtimeImage/JavaSEReproducibleTest.java index d923358aed9..49ce65b08ed 100644 --- a/test/jdk/tools/jlink/runtimeImage/JavaSEReproducibleTest.java +++ b/test/jdk/tools/jlink/runtimeImage/JavaSEReproducibleTest.java @@ -40,7 +40,7 @@ import tests.Helper; * jdk.jlink/jdk.tools.jimage * @build tests.* jdk.test.lib.process.OutputAnalyzer * jdk.test.lib.process.ProcessTools - * @run main/othervm -Xmx1g JavaSEReproducibleTest + * @run main/othervm/timeout=480 -Xmx1g JavaSEReproducibleTest */ public class JavaSEReproducibleTest extends AbstractLinkableRuntimeTest { diff --git a/test/jdk/tools/jpackage/macosx/DmgContentTest.java b/test/jdk/tools/jpackage/macosx/DmgContentTest.java index c670d111e20..f6c2fe63671 100644 --- a/test/jdk/tools/jpackage/macosx/DmgContentTest.java +++ b/test/jdk/tools/jpackage/macosx/DmgContentTest.java @@ -42,7 +42,7 @@ import java.util.List; * @build jdk.jpackage.test.* * @build DmgContentTest * @requires (os.family == "mac") - * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main + * @run main/othervm/timeout=1440 -Xmx512m jdk.jpackage.test.Main * --jpt-run=DmgContentTest */ public class DmgContentTest { diff --git a/test/jdk/tools/jpackage/macosx/MacFileAssociationsTest.java b/test/jdk/tools/jpackage/macosx/MacFileAssociationsTest.java index 889a5bb374e..81831f59da3 100644 --- a/test/jdk/tools/jpackage/macosx/MacFileAssociationsTest.java +++ b/test/jdk/tools/jpackage/macosx/MacFileAssociationsTest.java @@ -44,7 +44,7 @@ import jdk.jpackage.test.Annotations.Test; * @build jdk.jpackage.test.* * @build MacFileAssociationsTest * @requires (os.family == "mac") - * @run main/othervm -Xmx512m jdk.jpackage.test.Main + * @run main/othervm/timeout=480 -Xmx512m jdk.jpackage.test.Main * --jpt-run=MacFileAssociationsTest */ public class MacFileAssociationsTest { diff --git a/test/jdk/tools/jpackage/share/AddLauncherTest.java b/test/jdk/tools/jpackage/share/AddLauncherTest.java index 8d5f0de28f2..a7bfbf376ed 100644 --- a/test/jdk/tools/jpackage/share/AddLauncherTest.java +++ b/test/jdk/tools/jpackage/share/AddLauncherTest.java @@ -50,7 +50,7 @@ import jdk.jpackage.test.CfgFile; * @library /test/jdk/tools/jpackage/helpers * @build jdk.jpackage.test.* * @compile -Xlint:all -Werror AddLauncherTest.java - * @run main/othervm/timeout=360 -Xmx512m + * @run main/othervm/timeout=1440 -Xmx512m * jdk.jpackage.test.Main * --jpt-run=AddLauncherTest.test */ @@ -63,7 +63,7 @@ import jdk.jpackage.test.CfgFile; * @library /test/jdk/tools/jpackage/helpers * @build jdk.jpackage.test.* * @compile -Xlint:all -Werror AddLauncherTest.java - * @run main/othervm/timeout=540 -Xmx512m + * @run main/othervm/timeout=2160 -Xmx512m * jdk.jpackage.test.Main * --jpt-run=AddLauncherTest */ diff --git a/test/jdk/tools/jpackage/share/AppLauncherSubstTest.java b/test/jdk/tools/jpackage/share/AppLauncherSubstTest.java index abd1288e024..3cbb14e4015 100644 --- a/test/jdk/tools/jpackage/share/AppLauncherSubstTest.java +++ b/test/jdk/tools/jpackage/share/AppLauncherSubstTest.java @@ -52,7 +52,7 @@ import jdk.jpackage.test.TKit; * @library /test/jdk/tools/jpackage/helpers * @build jdk.jpackage.test.* * @build AppLauncherSubstTest - * @run main/othervm -Xmx512m jdk.jpackage.test.Main + * @run main/othervm/timeout=480 -Xmx512m jdk.jpackage.test.Main * --jpt-run=AppLauncherSubstTest */ public class AppLauncherSubstTest { diff --git a/test/jdk/tools/jpackage/share/AppVersionTest.java b/test/jdk/tools/jpackage/share/AppVersionTest.java index c9e66cbd7a1..ad96a9b9e0c 100644 --- a/test/jdk/tools/jpackage/share/AppVersionTest.java +++ b/test/jdk/tools/jpackage/share/AppVersionTest.java @@ -39,7 +39,7 @@ import jdk.jpackage.test.TKit; * @library /test/jdk/tools/jpackage/helpers * @build jdk.jpackage.test.* * @compile -Xlint:all -Werror AppVersionTest.java - * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main + * @run main/othervm/timeout=1440 -Xmx512m jdk.jpackage.test.Main * --jpt-run=AppVersionTest */ diff --git a/test/jdk/tools/jpackage/share/BasicTest.java b/test/jdk/tools/jpackage/share/BasicTest.java index b55f7bb87ad..7dcd9f73d2d 100644 --- a/test/jdk/tools/jpackage/share/BasicTest.java +++ b/test/jdk/tools/jpackage/share/BasicTest.java @@ -57,7 +57,7 @@ import jdk.tools.jlink.internal.LinkableRuntimeImage; * @library /test/jdk/tools/jpackage/helpers * @build jdk.jpackage.test.* * @compile -Xlint:all -Werror BasicTest.java - * @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main + * @run main/othervm/timeout=2880 -Xmx512m jdk.jpackage.test.Main * --jpt-run=BasicTest */ diff --git a/test/jdk/tools/jpackage/share/IconTest.java b/test/jdk/tools/jpackage/share/IconTest.java index df207d1c30a..a2a9e67bd91 100644 --- a/test/jdk/tools/jpackage/share/IconTest.java +++ b/test/jdk/tools/jpackage/share/IconTest.java @@ -52,7 +52,7 @@ import jdk.jpackage.test.Annotations.Test; * @library /test/jdk/tools/jpackage/helpers * @build jdk.jpackage.test.* * @compile -Xlint:all -Werror IconTest.java - * @run main/othervm/timeout=720 -Xmx512m + * @run main/othervm/timeout=2880 -Xmx512m * jdk.jpackage.test.Main * --jpt-run=IconTest */ diff --git a/test/jdk/tools/jpackage/share/InOutPathTest.java b/test/jdk/tools/jpackage/share/InOutPathTest.java index f5fe3c618ae..f7c597d2ed3 100644 --- a/test/jdk/tools/jpackage/share/InOutPathTest.java +++ b/test/jdk/tools/jpackage/share/InOutPathTest.java @@ -50,7 +50,7 @@ import jdk.jpackage.test.TKit; * @library /test/jdk/tools/jpackage/helpers * @build jdk.jpackage.test.* * @compile -Xlint:all -Werror InOutPathTest.java - * @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main + * @run main/othervm/timeout=2880 -Xmx512m jdk.jpackage.test.Main * --jpt-run=InOutPathTest */ public final class InOutPathTest { diff --git a/test/jdk/tools/jpackage/share/InstallDirTest.java b/test/jdk/tools/jpackage/share/InstallDirTest.java index bbdc118d60b..5106eed3fc6 100644 --- a/test/jdk/tools/jpackage/share/InstallDirTest.java +++ b/test/jdk/tools/jpackage/share/InstallDirTest.java @@ -66,7 +66,7 @@ import jdk.jpackage.test.TKit.TextStreamVerifier; * @build jdk.jpackage.test.* * @compile -Xlint:all -Werror InstallDirTest.java * @requires (jpackage.test.SQETest != null) - * @run main/othervm/timeout=540 -Xmx512m jdk.jpackage.test.Main + * @run main/othervm/timeout=4000 -Xmx512m jdk.jpackage.test.Main * --jpt-run=InstallDirTest.testCommon */ @@ -78,7 +78,7 @@ import jdk.jpackage.test.TKit.TextStreamVerifier; * @build jdk.jpackage.test.* * @compile -Xlint:all -Werror InstallDirTest.java * @requires (jpackage.test.SQETest == null) - * @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main + * @run main/othervm/timeout=4000 -Xmx512m jdk.jpackage.test.Main * --jpt-run=InstallDirTest */ public class InstallDirTest { diff --git a/test/jdk/tools/jpackage/share/JavaOptionsTest.java b/test/jdk/tools/jpackage/share/JavaOptionsTest.java index cb720dfb2a3..d1a0dbccf83 100644 --- a/test/jdk/tools/jpackage/share/JavaOptionsTest.java +++ b/test/jdk/tools/jpackage/share/JavaOptionsTest.java @@ -37,7 +37,7 @@ import jdk.jpackage.test.TKit; * @library /test/jdk/tools/jpackage/helpers * @build jdk.jpackage.test.* * @compile -Xlint:all -Werror JavaOptionsTest.java - * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main + * @run main/othervm/timeout=2840 -Xmx512m jdk.jpackage.test.Main * --jpt-run=JavaOptionsTest * --jpt-before-run=jdk.jpackage.test.JPackageCommand.useToolProviderByDefault */ diff --git a/test/jdk/tools/jpackage/share/MainClassTest.java b/test/jdk/tools/jpackage/share/MainClassTest.java index dd89d84e46d..bc813c4ec15 100644 --- a/test/jdk/tools/jpackage/share/MainClassTest.java +++ b/test/jdk/tools/jpackage/share/MainClassTest.java @@ -58,7 +58,7 @@ import jdk.jpackage.test.TKit; * @library /test/jdk/tools/jpackage/helpers * @build jdk.jpackage.test.* * @compile -Xlint:all -Werror MainClassTest.java - * @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main + * @run main/othervm/timeout=2880 -Xmx512m jdk.jpackage.test.Main * --jpt-run=MainClassTest */ diff --git a/test/jdk/tools/jpackage/share/MultiNameTwoPhaseTest.java b/test/jdk/tools/jpackage/share/MultiNameTwoPhaseTest.java index 8becb6f3dc3..de8412c2839 100644 --- a/test/jdk/tools/jpackage/share/MultiNameTwoPhaseTest.java +++ b/test/jdk/tools/jpackage/share/MultiNameTwoPhaseTest.java @@ -46,7 +46,7 @@ import jdk.jpackage.test.JPackageCommand; * @requires (jpackage.test.SQETest == null) * @build jdk.jpackage.test.* * @compile -Xlint:all -Werror MultiNameTwoPhaseTest.java - * @run main/othervm/timeout=540 -Xmx512m jdk.jpackage.test.Main + * @run main/othervm/timeout=2160 -Xmx512m jdk.jpackage.test.Main * --jpt-run=MultiNameTwoPhaseTest */ diff --git a/test/jdk/tools/jpackage/share/PostImageScriptTest.java b/test/jdk/tools/jpackage/share/PostImageScriptTest.java index bbdd0b7c581..68ded999e4a 100644 --- a/test/jdk/tools/jpackage/share/PostImageScriptTest.java +++ b/test/jdk/tools/jpackage/share/PostImageScriptTest.java @@ -52,7 +52,7 @@ import jdk.jpackage.test.TKit; * @library /test/jdk/tools/jpackage/helpers * @build jdk.jpackage.test.* * @compile -Xlint:all -Werror PostImageScriptTest.java - * @run main/othervm/timeout=720 -Xmx512m + * @run main/othervm/timeout=2880 -Xmx512m * jdk.jpackage.test.Main * --jpt-run=PostImageScriptTest */ diff --git a/test/jdk/tools/jpackage/windows/WinNoRestartTest.java b/test/jdk/tools/jpackage/windows/WinNoRestartTest.java index c76f68476db..7f04ee2bd2e 100644 --- a/test/jdk/tools/jpackage/windows/WinNoRestartTest.java +++ b/test/jdk/tools/jpackage/windows/WinNoRestartTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -41,7 +41,7 @@ import static jdk.jpackage.test.WindowsHelper.killAppLauncherProcess; * @requires os.family == "windows" * @build jdk.jpackage.test.* * @build WinNoRestartTest - * @run main/othervm -Xmx512m jdk.jpackage.test.Main + * @run main/othervm/timeout=480 -Xmx512m jdk.jpackage.test.Main * --jpt-run=WinNoRestartTest */ diff --git a/test/jdk/tools/launcher/InstanceMainTest.java b/test/jdk/tools/launcher/InstanceMainTest.java index 699db27d7bb..273d56a86bd 100644 --- a/test/jdk/tools/launcher/InstanceMainTest.java +++ b/test/jdk/tools/launcher/InstanceMainTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -30,7 +30,7 @@ import java.util.function.Consumer; * @test * @bug 8329420 * @summary test execution priority and behavior of main methods - * @run main InstanceMainTest + * @run main/timeout=480 InstanceMainTest */ public class InstanceMainTest extends TestHelper { diff --git a/test/langtools/jdk/javadoc/doclet/testLinkOption/TestRedirectLinks.java b/test/langtools/jdk/javadoc/doclet/testLinkOption/TestRedirectLinks.java index 9a80ca4d089..3c51b938396 100644 --- a/test/langtools/jdk/javadoc/doclet/testLinkOption/TestRedirectLinks.java +++ b/test/langtools/jdk/javadoc/doclet/testLinkOption/TestRedirectLinks.java @@ -34,7 +34,7 @@ * @build toolbox.ToolBox toolbox.JavacTask javadoc.tester.* * @build jtreg.SkippedException * @build jdk.test.lib.Platform jdk.test.lib.net.SimpleSSLContext jdk.test.lib.net.URIBuilder - * @run main TestRedirectLinks + * @run main/timeout=480 TestRedirectLinks */ import java.io.File; diff --git a/test/langtools/jdk/jshell/ClassesTest.java b/test/langtools/jdk/jshell/ClassesTest.java index 8c17c8072f8..3da389e5059 100644 --- a/test/langtools/jdk/jshell/ClassesTest.java +++ b/test/langtools/jdk/jshell/ClassesTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ * @bug 8145239 8129559 8080354 8189248 8010319 8246353 8247456 8282160 8292755 8319532 * @summary Tests for EvaluationState.classes * @build KullaTesting TestingInputStream ExpectedDiagnostic - * @run testng ClassesTest + * @run testng/timeout=480 ClassesTest */ import java.util.ArrayList; diff --git a/test/langtools/jdk/jshell/CompletionSuggestionTest.java b/test/langtools/jdk/jshell/CompletionSuggestionTest.java index fb9e8eacc4a..cfbe874e6f2 100644 --- a/test/langtools/jdk/jshell/CompletionSuggestionTest.java +++ b/test/langtools/jdk/jshell/CompletionSuggestionTest.java @@ -32,7 +32,7 @@ * jdk.jshell/jdk.jshell:open * @build toolbox.ToolBox toolbox.JarTask toolbox.JavacTask * @build KullaTesting TestingInputStream Compiler - * @run testng CompletionSuggestionTest + * @run testng/timeout=480 CompletionSuggestionTest */ import java.io.IOException; diff --git a/test/langtools/jdk/jshell/HangingRemoteAgent.java b/test/langtools/jdk/jshell/HangingRemoteAgent.java index 515f98731a3..141499b0cfd 100644 --- a/test/langtools/jdk/jshell/HangingRemoteAgent.java +++ b/test/langtools/jdk/jshell/HangingRemoteAgent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -35,9 +35,7 @@ import jdk.jshell.spi.ExecutionControlProvider; */ class HangingRemoteAgent extends RemoteExecutionControl { - private static float timeoutFactor = Float.parseFloat(System.getProperty("test.timeout.factor", "1.0")); - - private static final int TIMEOUT = (int)(2000 * timeoutFactor); + private static final int TIMEOUT = (int)(2000 * Double.parseDouble(System.getProperty("test.timeout.factor", "1.0"))); private static final long DELAY = TIMEOUT * 2L; private static final boolean INFRA_VERIFY = false; diff --git a/test/langtools/jdk/jshell/JdiHangingLaunchExecutionControlTest.java b/test/langtools/jdk/jshell/JdiHangingLaunchExecutionControlTest.java index 577228d4820..cb8fc2ea408 100644 --- a/test/langtools/jdk/jshell/JdiHangingLaunchExecutionControlTest.java +++ b/test/langtools/jdk/jshell/JdiHangingLaunchExecutionControlTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,7 +27,7 @@ * @summary Tests for JDI connector timeout failure * @modules jdk.jshell/jdk.jshell jdk.jshell/jdk.jshell.spi jdk.jshell/jdk.jshell.execution * @build HangingRemoteAgent - * @run testng JdiHangingLaunchExecutionControlTest + * @run testng/timeout=480 JdiHangingLaunchExecutionControlTest */ import org.testng.annotations.Test; diff --git a/test/langtools/jdk/jshell/JdiHangingListenExecutionControlTest.java b/test/langtools/jdk/jshell/JdiHangingListenExecutionControlTest.java index 2e9b04a634b..d43c3f170bd 100644 --- a/test/langtools/jdk/jshell/JdiHangingListenExecutionControlTest.java +++ b/test/langtools/jdk/jshell/JdiHangingListenExecutionControlTest.java @@ -27,7 +27,7 @@ * @summary Tests for JDI connector timeout failure * @modules jdk.jshell/jdk.jshell jdk.jshell/jdk.jshell.spi jdk.jshell/jdk.jshell.execution * @build HangingRemoteAgent - * @run testng JdiHangingListenExecutionControlTest + * @run testng/timeout=480 JdiHangingListenExecutionControlTest * @key intermittent */ diff --git a/test/langtools/jdk/jshell/ToolLocalSimpleTest.java b/test/langtools/jdk/jshell/ToolLocalSimpleTest.java index bb6f4588968..6af4b82dbb9 100644 --- a/test/langtools/jdk/jshell/ToolLocalSimpleTest.java +++ b/test/langtools/jdk/jshell/ToolLocalSimpleTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -30,7 +30,7 @@ * jdk.jdeps/com.sun.tools.javap * jdk.jshell/jdk.internal.jshell.tool * @build KullaTesting TestingInputStream ToolSimpleTest - * @run testng/othervm ToolLocalSimpleTest + * @run testng/othervm/timeout=480 ToolLocalSimpleTest */ import java.util.Locale; diff --git a/test/langtools/jdk/jshell/ToolSimpleTest.java b/test/langtools/jdk/jshell/ToolSimpleTest.java index 62ea2451fb4..4ed0e741d49 100644 --- a/test/langtools/jdk/jshell/ToolSimpleTest.java +++ b/test/langtools/jdk/jshell/ToolSimpleTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -35,7 +35,7 @@ * jdk.jshell/jdk.internal.jshell.tool * java.desktop * @build KullaTesting TestingInputStream - * @run testng ToolSimpleTest + * @run testng/timeout=480 ToolSimpleTest */ import java.util.ArrayList; diff --git a/test/langtools/jdk/jshell/UITesting.java b/test/langtools/jdk/jshell/UITesting.java index cc821b1874b..e7daa4df8e6 100644 --- a/test/langtools/jdk/jshell/UITesting.java +++ b/test/langtools/jdk/jshell/UITesting.java @@ -145,18 +145,7 @@ public class UITesting { public void test(Writer inputSink, StringBuilder out) throws Exception; } - private static final long TIMEOUT; - - static { - long factor; - - try { - factor = (long) Double.parseDouble(System.getProperty("test.timeout.factor", "1")); - } catch (NumberFormatException ex) { - factor = 1; - } - TIMEOUT = 60_000 * factor; - } + private static final long TIMEOUT = (long) (60_000 * Double.parseDouble(System.getProperty("test.timeout.factor", "1.0"))); protected void waitOutput(StringBuilder out, String expected) { waitOutput(out, expected, null); diff --git a/test/langtools/jdk/jshell/VariablesTest.java b/test/langtools/jdk/jshell/VariablesTest.java index a7aabc0ead6..64d25e8a63c 100644 --- a/test/langtools/jdk/jshell/VariablesTest.java +++ b/test/langtools/jdk/jshell/VariablesTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -30,7 +30,7 @@ * jdk.compiler/com.sun.tools.javac.main * jdk.jshell * @build Compiler KullaTesting TestingInputStream ExpectedDiagnostic - * @run testng VariablesTest + * @run testng/timeout=480 VariablesTest */ import java.nio.file.Path; diff --git a/test/langtools/tools/javac/Paths/MineField.java b/test/langtools/tools/javac/Paths/MineField.java index ee8ead00027..f01afeef3aa 100644 --- a/test/langtools/tools/javac/Paths/MineField.java +++ b/test/langtools/tools/javac/Paths/MineField.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -28,7 +28,7 @@ * @summary Test that javac and java find files in similar ways * @library /tools/lib * @build toolbox.ToolBox Util MineField - * @run main MineField + * @run main/timeout=480 MineField */ /* diff --git a/test/langtools/tools/javac/Paths/WildcardMineField.java b/test/langtools/tools/javac/Paths/WildcardMineField.java index ad1362080b1..c47337923f6 100644 --- a/test/langtools/tools/javac/Paths/WildcardMineField.java +++ b/test/langtools/tools/javac/Paths/WildcardMineField.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,7 +27,7 @@ * @summary Test classpath wildcards for javac and java -classpath option. * @library /tools/lib * @build toolbox.ToolBox Util WildcardMineField - * @run main WildcardMineField + * @run main/timeout=480 WildcardMineField */ /* diff --git a/test/langtools/tools/javac/diags/CheckExamples.java b/test/langtools/tools/javac/diags/CheckExamples.java index dd763f3d3da..502f5fa8b88 100644 --- a/test/langtools/tools/javac/diags/CheckExamples.java +++ b/test/langtools/tools/javac/diags/CheckExamples.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -31,7 +31,7 @@ * jdk.compiler/com.sun.tools.javac.resources:open * jdk.compiler/com.sun.tools.javac.util * @build Example CheckExamples DocCommentProcessor - * @run main/othervm CheckExamples + * @run main/othervm/timeout=480 CheckExamples */ /* diff --git a/test/langtools/tools/javac/diags/RunExamples.java b/test/langtools/tools/javac/diags/RunExamples.java index 7e956aefb36..7805efa734b 100644 --- a/test/langtools/tools/javac/diags/RunExamples.java +++ b/test/langtools/tools/javac/diags/RunExamples.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -32,7 +32,7 @@ * jdk.compiler/com.sun.tools.javac.parser * jdk.compiler/com.sun.tools.javac.util * @build ArgTypeCompilerFactory Example HTMLWriter RunExamples DocCommentProcessor - * @run main/othervm RunExamples + * @run main/othervm/timeout=480 RunExamples */ /* * See CR 7127924 for info on why othervm is used. diff --git a/test/langtools/tools/javac/failover/CheckAttributedTree.java b/test/langtools/tools/javac/failover/CheckAttributedTree.java index 1969a97df05..9b28d2bebd4 100644 --- a/test/langtools/tools/javac/failover/CheckAttributedTree.java +++ b/test/langtools/tools/javac/failover/CheckAttributedTree.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -34,7 +34,7 @@ * jdk.compiler/com.sun.tools.javac.tree * jdk.compiler/com.sun.tools.javac.util * @build combo.ComboTestHelper - * @run main CheckAttributedTree -q -r -et ERRONEOUS . + * @run main/timeout=480 CheckAttributedTree -q -r -et ERRONEOUS . */ import java.awt.BorderLayout; diff --git a/test/langtools/tools/javac/file/MultiReleaseJar/MultiReleaseJarTest.java b/test/langtools/tools/javac/file/MultiReleaseJar/MultiReleaseJarTest.java index ce2ce4530f8..09209e14c9d 100644 --- a/test/langtools/tools/javac/file/MultiReleaseJar/MultiReleaseJarTest.java +++ b/test/langtools/tools/javac/file/MultiReleaseJar/MultiReleaseJarTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -30,7 +30,7 @@ * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.main * @build toolbox.ToolBox toolbox.JarTask toolbox.JavacTask - * @run testng MultiReleaseJarTest + * @run testng/timeout=480 MultiReleaseJarTest */ import org.testng.annotations.AfterClass; diff --git a/test/langtools/tools/javac/generics/diamond/7030150/GenericConstructorAndDiamondTest.java b/test/langtools/tools/javac/generics/diamond/7030150/GenericConstructorAndDiamondTest.java index 727f749c1c9..4c4775ed744 100644 --- a/test/langtools/tools/javac/generics/diamond/7030150/GenericConstructorAndDiamondTest.java +++ b/test/langtools/tools/javac/generics/diamond/7030150/GenericConstructorAndDiamondTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,6 +26,7 @@ * @bug 7030150 7039931 * @summary Type inference for generic instance creation failed for formal type parameter * @modules jdk.compiler + * @run main/timeout=480 GenericConstructorAndDiamondTest */ import com.sun.source.util.JavacTask; diff --git a/test/langtools/tools/javac/importscope/NegativeCyclicDependencyTest.java b/test/langtools/tools/javac/importscope/NegativeCyclicDependencyTest.java index cf204264367..83ff216ef7a 100644 --- a/test/langtools/tools/javac/importscope/NegativeCyclicDependencyTest.java +++ b/test/langtools/tools/javac/importscope/NegativeCyclicDependencyTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -29,7 +29,7 @@ * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.main * @build toolbox.ToolBox NegativeCyclicDependencyTest - * @run main NegativeCyclicDependencyTest + * @run main/timeout=480 NegativeCyclicDependencyTest */ import javax.tools.JavaCompiler; diff --git a/test/langtools/tools/javac/lambda/LambdaParserTest.java b/test/langtools/tools/javac/lambda/LambdaParserTest.java index e3440d3b17f..53578d9c40d 100644 --- a/test/langtools/tools/javac/lambda/LambdaParserTest.java +++ b/test/langtools/tools/javac/lambda/LambdaParserTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -33,7 +33,7 @@ * jdk.compiler/com.sun.tools.javac.util * @build combo.ComboTestHelper - * @run main LambdaParserTest + * @run main/timeout=480 LambdaParserTest */ import java.io.IOException; diff --git a/test/langtools/tools/javac/lambda/bridge/template_tests/TEST.properties b/test/langtools/tools/javac/lambda/bridge/template_tests/TEST.properties index 90f2fe459c2..9acbe8f1700 100644 --- a/test/langtools/tools/javac/lambda/bridge/template_tests/TEST.properties +++ b/test/langtools/tools/javac/lambda/bridge/template_tests/TEST.properties @@ -6,3 +6,5 @@ lib.dirs = /lib/combo modules = \ jdk.compiler/com.sun.tools.javac.util + +timeout.default.seconds=480 diff --git a/test/langtools/tools/javac/lambda/intersection/IntersectionTargetTypeTest.java b/test/langtools/tools/javac/lambda/intersection/IntersectionTargetTypeTest.java index e702ea3e75a..27a902fcb32 100644 --- a/test/langtools/tools/javac/lambda/intersection/IntersectionTargetTypeTest.java +++ b/test/langtools/tools/javac/lambda/intersection/IntersectionTargetTypeTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,6 +26,7 @@ * @bug 8002099 8010822 * @summary Add support for intersection types in cast expression * @modules jdk.compiler/com.sun.tools.javac.util + * @run main/timeout=480 IntersectionTargetTypeTest */ import com.sun.source.util.JavacTask; diff --git a/test/langtools/tools/javac/platform/createsymbols/CreateSymbolsReproducibleTest.java b/test/langtools/tools/javac/platform/createsymbols/CreateSymbolsReproducibleTest.java index a6298bfa8ce..ee3bb8c897d 100644 --- a/test/langtools/tools/javac/platform/createsymbols/CreateSymbolsReproducibleTest.java +++ b/test/langtools/tools/javac/platform/createsymbols/CreateSymbolsReproducibleTest.java @@ -49,7 +49,7 @@ import org.junit.jupiter.api.Test; * * @compile ${test.root}/../../make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java * - * @run junit CreateSymbolsReproducibleTest + * @run junit/timeout=480 CreateSymbolsReproducibleTest */ public class CreateSymbolsReproducibleTest { diff --git a/test/langtools/tools/javac/tree/JavacTreeScannerTest.java b/test/langtools/tools/javac/tree/JavacTreeScannerTest.java index 590cdb849c4..8e9c0501f8e 100644 --- a/test/langtools/tools/javac/tree/JavacTreeScannerTest.java +++ b/test/langtools/tools/javac/tree/JavacTreeScannerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -41,7 +41,7 @@ * jdk.compiler/com.sun.tools.javac.tree * jdk.compiler/com.sun.tools.javac.util * @build AbstractTreeScannerTest JavacTreeScannerTest - * @run main JavacTreeScannerTest -q -r . + * @run main/timeout=480 JavacTreeScannerTest -q -r . */ import java.io.*; diff --git a/test/langtools/tools/javac/tree/SourceDocTreeScannerTest.java b/test/langtools/tools/javac/tree/SourceDocTreeScannerTest.java index 72cc2d2e9d1..da069f4f911 100644 --- a/test/langtools/tools/javac/tree/SourceDocTreeScannerTest.java +++ b/test/langtools/tools/javac/tree/SourceDocTreeScannerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -40,7 +40,7 @@ * jdk.compiler/com.sun.tools.javac.tree * jdk.compiler/com.sun.tools.javac.util * @build AbstractTreeScannerTest SourceDocTreeScannerTest - * @run main SourceDocTreeScannerTest -q -r . + * @run main/timeout=480 SourceDocTreeScannerTest -q -r . */ import java.io.*; diff --git a/test/langtools/tools/javac/tree/SourceTreeScannerTest.java b/test/langtools/tools/javac/tree/SourceTreeScannerTest.java index bf50f298871..de68377a3c6 100644 --- a/test/langtools/tools/javac/tree/SourceTreeScannerTest.java +++ b/test/langtools/tools/javac/tree/SourceTreeScannerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -41,7 +41,7 @@ * jdk.compiler/com.sun.tools.javac.tree * jdk.compiler/com.sun.tools.javac.util * @build AbstractTreeScannerTest SourceTreeScannerTest - * @run main SourceTreeScannerTest -q -r . + * @run main/timeout=480 SourceTreeScannerTest -q -r . */ import java.io.*; diff --git a/test/langtools/tools/javac/types/TestComparisons.java b/test/langtools/tools/javac/types/TestComparisons.java index 9835e1271f5..8b15edd6715 100644 --- a/test/langtools/tools/javac/types/TestComparisons.java +++ b/test/langtools/tools/javac/types/TestComparisons.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,6 +26,7 @@ * @bug 8013357 * @summary javac should correctly enforce binary comparison rules. * @modules jdk.compiler + * @run main/timeout=480 TestComparisons */ import java.io.*; diff --git a/test/langtools/tools/javac/util/IteratorsTest.java b/test/langtools/tools/javac/util/IteratorsTest.java index cbfde59b1e1..bd05bebeb09 100644 --- a/test/langtools/tools/javac/util/IteratorsTest.java +++ b/test/langtools/tools/javac/util/IteratorsTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ * @bug 8303882 * @summary Verify that Iterators method work as expected * @modules jdk.compiler/com.sun.tools.javac.util - * @run junit IteratorsTest + * @run junit/timeout=480 IteratorsTest */ import com.sun.tools.javac.util.Iterators; diff --git a/test/langtools/tools/javac/varargs/warning/Warn5.java b/test/langtools/tools/javac/varargs/warning/Warn5.java index af8c045e62b..114f94ebc91 100644 --- a/test/langtools/tools/javac/varargs/warning/Warn5.java +++ b/test/langtools/tools/javac/varargs/warning/Warn5.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -31,7 +31,7 @@ * jdk.compiler/com.sun.tools.javac.file * jdk.compiler/com.sun.tools.javac.util * @build combo.ComboTestHelper - * @run main/othervm Warn5 + * @run main/othervm/timeout=480 Warn5 */ import java.io.IOException; diff --git a/test/langtools/tools/lib/toolbox/ToolBox.java b/test/langtools/tools/lib/toolbox/ToolBox.java index 0763da16ee5..ee217ab2c0c 100644 --- a/test/langtools/tools/lib/toolbox/ToolBox.java +++ b/test/langtools/tools/lib/toolbox/ToolBox.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -102,12 +102,6 @@ public class ToolBox { public static final String testSrc = System.getProperty("test.src"); /** The location of the test JDK for this test, or null if not set. */ public static final String testJDK = System.getProperty("test.jdk"); - /** The timeout factor for slow systems. */ - public static final float timeoutFactor; - static { - String ttf = System.getProperty("test.timeout.factor"); - timeoutFactor = (ttf == null) ? 1.0f : Float.parseFloat(ttf); - } /** The current directory. */ public static final Path currDir = Path.of("."); @@ -482,8 +476,8 @@ public class ToolBox { throw new IOException("File not deleted: " + path); } - private static final int RETRY_DELETE_MILLIS = isWindows() ? (int)(500 * timeoutFactor): 0; - private static final int MAX_RETRY_DELETE_MILLIS = isWindows() ? (int)(15 * 1000 * timeoutFactor) : 0; + private static final int RETRY_DELETE_MILLIS = isWindows() ? 500 : 0; + private static final int MAX_RETRY_DELETE_MILLIS = isWindows() ? 60 * 1000 : 0; /** * Moves a file. diff --git a/test/lib/jdk/test/lib/cds/CDSTestUtils.java b/test/lib/jdk/test/lib/cds/CDSTestUtils.java index 56e3baa2e25..13ac2e4e97a 100644 --- a/test/lib/jdk/test/lib/cds/CDSTestUtils.java +++ b/test/lib/jdk/test/lib/cds/CDSTestUtils.java @@ -228,9 +228,6 @@ public class CDSTestUtils { public static final boolean copyChildStdoutToMainStdout = Boolean.getBoolean("test.cds.copy.child.stdout"); - // This property is passed to child test processes - public static final String TestTimeoutFactor = System.getProperty("test.timeout.factor", "1.0"); - public static final String UnableToMapMsg = "Unable to map shared archive: test did not complete"; @@ -433,7 +430,7 @@ public class CDSTestUtils { ArrayList cmd = new ArrayList(); cmd.addAll(opts.prefix); cmd.add("-Xshare:" + opts.xShareMode); - cmd.add("-Dtest.timeout.factor=" + TestTimeoutFactor); + cmd.add("-Dtest.timeout.factor=" + Utils.TIMEOUT_FACTOR); if (!opts.useSystemArchive) { if (opts.archiveName == null) diff --git a/test/lib/jdk/test/lib/util/ForceGC.java b/test/lib/jdk/test/lib/util/ForceGC.java index e3587b9a2be..b1517d38175 100644 --- a/test/lib/jdk/test/lib/util/ForceGC.java +++ b/test/lib/jdk/test/lib/util/ForceGC.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,15 +27,12 @@ import java.lang.ref.PhantomReference; import java.lang.ref.Reference; import java.lang.ref.ReferenceQueue; import java.util.function.BooleanSupplier; +import jdk.test.lib.Utils; /** * Utility class to invoke System.gc() */ public class ForceGC { - // The jtreg testing timeout factor. - private static final double TIMEOUT_FACTOR = Double.valueOf( - System.getProperty("test.timeout.factor", "1.0")); - /** * Causes the current thread to wait until the {@code booleanSupplier} * returns true, or the waiting time elapses. The waiting time @@ -57,7 +54,7 @@ public class ForceGC { */ public static boolean wait(BooleanSupplier booleanSupplier) { - return waitFor(booleanSupplier, Math.round(1000L * TIMEOUT_FACTOR)); + return waitFor(booleanSupplier, Math.round(1000L * Utils.TIMEOUT_FACTOR)); } /**