From 71b353889cdbc78f7b309b54eac0b2461be659aa Mon Sep 17 00:00:00 2001 From: Vladimir Petko Date: Fri, 21 Nov 2025 14:43:07 +1300 Subject: [PATCH 1/2] chore: disable JFR tests on s390x --- test/hotspot/jtreg/applications/ctw/modules/jdk_jfr.java | 3 ++- .../intrinsics/TestReturnOopSetForJFRWriteCheckpoint.java | 1 + test/jdk/jdk/jfr/api/consumer/TestRecordingFileWrite.java | 3 ++- .../jfr/api/consumer/streaming/TestCrossProcessStreaming.java | 1 + test/jdk/jdk/jfr/api/consumer/streaming/TestFilledChunks.java | 1 + test/jdk/jdk/jfr/api/consumer/streaming/TestRemovedChunks.java | 1 + .../jdk/jfr/api/recording/misc/TestGetStreamWithFailure.java | 1 + test/jdk/jdk/jfr/api/settings/TestSettingControl.java | 1 + test/jdk/jdk/jfr/event/runtime/TestBackToBackSensitive.java | 1 + .../jdk/jfr/event/runtime/TestSyncOnValueBasedClassEvent.java | 1 + test/jdk/jdk/jfr/event/tracing/TestMultipleThreads.java | 1 + test/jdk/jdk/jfr/event/tracing/TestTracedString.java | 1 + test/jdk/jdk/jfr/javaagent/TestLoadedAgent.java | 1 + test/jdk/jdk/jfr/javaagent/TestPremainAgent.java | 1 + test/jdk/jdk/jfr/jmx/streaming/TestClose.java | 1 + test/jdk/jdk/jfr/jmx/streaming/TestMaxSize.java | 1 + test/jdk/jdk/jfr/jvm/TestChunkIntegrity.java | 1 + test/jdk/jdk/jfr/jvm/TestJFRIntrinsic.java | 1 + test/jdk/jdk/jfr/tool/TestDisassemble.java | 1 + test/jdk/jdk/jfr/tool/TestScrub.java | 1 + 20 files changed, 22 insertions(+), 2 deletions(-) diff --git a/test/hotspot/jtreg/applications/ctw/modules/jdk_jfr.java b/test/hotspot/jtreg/applications/ctw/modules/jdk_jfr.java index 9ebb309f725de..31e2551dec5c1 100644 --- a/test/hotspot/jtreg/applications/ctw/modules/jdk_jfr.java +++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_jfr.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 @@ -23,6 +23,7 @@ /* * @test + * @requires os.arch != "s390x" * @summary run CTW for all classes from jdk.jfr module * * @library /test/lib / /testlibrary/ctw/src diff --git a/test/hotspot/jtreg/compiler/intrinsics/TestReturnOopSetForJFRWriteCheckpoint.java b/test/hotspot/jtreg/compiler/intrinsics/TestReturnOopSetForJFRWriteCheckpoint.java index fd80b1630f35d..557c548c89d49 100644 --- a/test/hotspot/jtreg/compiler/intrinsics/TestReturnOopSetForJFRWriteCheckpoint.java +++ b/test/hotspot/jtreg/compiler/intrinsics/TestReturnOopSetForJFRWriteCheckpoint.java @@ -30,6 +30,7 @@ /** * @test + * @requires os.arch != "s390x" * @summary Tests that the getEventWriter call to write_checkpoint correctly * reports returning an oop * @bug 8347463 diff --git a/test/jdk/jdk/jfr/api/consumer/TestRecordingFileWrite.java b/test/jdk/jdk/jfr/api/consumer/TestRecordingFileWrite.java index 5fc0dab0d30aa..f17f5661d3c20 100644 --- a/test/jdk/jdk/jfr/api/consumer/TestRecordingFileWrite.java +++ b/test/jdk/jdk/jfr/api/consumer/TestRecordingFileWrite.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 @@ -39,6 +39,7 @@ /** * @test * @summary Tests RecordingFile::write(Path, Predicate) + * @requires os.arch != "s390x" * @requires vm.flagless * @requires vm.hasJFR * @library /test/lib diff --git a/test/jdk/jdk/jfr/api/consumer/streaming/TestCrossProcessStreaming.java b/test/jdk/jdk/jfr/api/consumer/streaming/TestCrossProcessStreaming.java index b4bc1fec8f834..b5c8feca376bd 100644 --- a/test/jdk/jdk/jfr/api/consumer/streaming/TestCrossProcessStreaming.java +++ b/test/jdk/jdk/jfr/api/consumer/streaming/TestCrossProcessStreaming.java @@ -42,6 +42,7 @@ * @test * @summary Test scenario where JFR event producer is in a different process * with respect to the JFR event stream consumer. + * @requires os.arch != "s390x" * @requires vm.flagless * @requires vm.hasJFR * @library /test/lib /test/jdk diff --git a/test/jdk/jdk/jfr/api/consumer/streaming/TestFilledChunks.java b/test/jdk/jdk/jfr/api/consumer/streaming/TestFilledChunks.java index f435fe9747fa7..2bed7f6f01b5f 100644 --- a/test/jdk/jdk/jfr/api/consumer/streaming/TestFilledChunks.java +++ b/test/jdk/jdk/jfr/api/consumer/streaming/TestFilledChunks.java @@ -32,6 +32,7 @@ /** * @test * @summary Test that it is possible to iterate over chunk with normal events + * @requires os.arch != "s390x" * @requires vm.flagless * @requires vm.hasJFR * @library /test/lib diff --git a/test/jdk/jdk/jfr/api/consumer/streaming/TestRemovedChunks.java b/test/jdk/jdk/jfr/api/consumer/streaming/TestRemovedChunks.java index f279f3acdfd2a..98f2d99489da7 100644 --- a/test/jdk/jdk/jfr/api/consumer/streaming/TestRemovedChunks.java +++ b/test/jdk/jdk/jfr/api/consumer/streaming/TestRemovedChunks.java @@ -32,6 +32,7 @@ /** * @test * @summary Tests that a stream can gracefully handle chunk being removed + * @requires os.arch != "s390x" * @requires vm.flagless * @requires vm.hasJFR * @library /test/lib diff --git a/test/jdk/jdk/jfr/api/recording/misc/TestGetStreamWithFailure.java b/test/jdk/jdk/jfr/api/recording/misc/TestGetStreamWithFailure.java index d294b06270eef..d9c440ea910e5 100644 --- a/test/jdk/jdk/jfr/api/recording/misc/TestGetStreamWithFailure.java +++ b/test/jdk/jdk/jfr/api/recording/misc/TestGetStreamWithFailure.java @@ -38,6 +38,7 @@ /** * @test * @summary Verify that resources are not leaked in case of failure + * @requires os.arch != "s390x" * @requires vm.flagless * @requires vm.hasJFR * @library /test/lib diff --git a/test/jdk/jdk/jfr/api/settings/TestSettingControl.java b/test/jdk/jdk/jfr/api/settings/TestSettingControl.java index e1c9ff1ea4760..73f9131e07cf7 100644 --- a/test/jdk/jdk/jfr/api/settings/TestSettingControl.java +++ b/test/jdk/jdk/jfr/api/settings/TestSettingControl.java @@ -44,6 +44,7 @@ /** * @test * @summary Tests that methods on all SettingControls have expected behavior. + * @requires os.arch != "s390x" * @requires vm.flagless * @requires vm.hasJFR * @library /test/lib /test/jdk diff --git a/test/jdk/jdk/jfr/event/runtime/TestBackToBackSensitive.java b/test/jdk/jdk/jfr/event/runtime/TestBackToBackSensitive.java index 91fcd60f87dab..369943e9a6c25 100644 --- a/test/jdk/jdk/jfr/event/runtime/TestBackToBackSensitive.java +++ b/test/jdk/jdk/jfr/event/runtime/TestBackToBackSensitive.java @@ -42,6 +42,7 @@ * @summary The test verifies that jdk.ClassLoaderStatistics and * jdk.ThreadThreadDump are not emitted at the beginning of a chunk * when the period is everyChunk, as is the case in default.jfc + * @requires os.arch != "s390x" * @requires vm.flagless * @requires vm.hasJFR * @library /test/lib /test/jdk diff --git a/test/jdk/jdk/jfr/event/runtime/TestSyncOnValueBasedClassEvent.java b/test/jdk/jdk/jfr/event/runtime/TestSyncOnValueBasedClassEvent.java index 7ad50c83399dd..123b3bc512d4b 100644 --- a/test/jdk/jdk/jfr/event/runtime/TestSyncOnValueBasedClassEvent.java +++ b/test/jdk/jdk/jfr/event/runtime/TestSyncOnValueBasedClassEvent.java @@ -35,6 +35,7 @@ /** * @test * @bug 8242263 + * @requires os.arch != "s390x" * @requires vm.hasJFR * @requires vm.flagless * @library /test/lib diff --git a/test/jdk/jdk/jfr/event/tracing/TestMultipleThreads.java b/test/jdk/jdk/jfr/event/tracing/TestMultipleThreads.java index 5b51d2346619d..890be4eea1047 100644 --- a/test/jdk/jdk/jfr/event/tracing/TestMultipleThreads.java +++ b/test/jdk/jdk/jfr/event/tracing/TestMultipleThreads.java @@ -31,6 +31,7 @@ /** * @test * @summary Tests that tracing and timing work when using multiple threads. + * @requires os.arch != "s390x" * @requires vm.flagless * @requires vm.hasJFR * @library /test/lib diff --git a/test/jdk/jdk/jfr/event/tracing/TestTracedString.java b/test/jdk/jdk/jfr/event/tracing/TestTracedString.java index d4bf84010eb7b..740144e0a7b33 100644 --- a/test/jdk/jdk/jfr/event/tracing/TestTracedString.java +++ b/test/jdk/jdk/jfr/event/tracing/TestTracedString.java @@ -33,6 +33,7 @@ /** * @test * @summary Tests that java.lang.String can be traced. + * @requires os.arch != "s390x" * @requires vm.flagless * @requires vm.hasJFR * @library /test/lib diff --git a/test/jdk/jdk/jfr/javaagent/TestLoadedAgent.java b/test/jdk/jdk/jfr/javaagent/TestLoadedAgent.java index 92b88336b3e0d..8c2a5fa7230d6 100644 --- a/test/jdk/jdk/jfr/javaagent/TestLoadedAgent.java +++ b/test/jdk/jdk/jfr/javaagent/TestLoadedAgent.java @@ -23,6 +23,7 @@ /** * @test + * @requires os.arch != "s390x" * @requires vm.flagless * @summary Tests emitting events in a dynamically loaded Java agent * @requires vm.hasJFR diff --git a/test/jdk/jdk/jfr/javaagent/TestPremainAgent.java b/test/jdk/jdk/jfr/javaagent/TestPremainAgent.java index 388779fcc7f84..efa26b8b46419 100644 --- a/test/jdk/jdk/jfr/javaagent/TestPremainAgent.java +++ b/test/jdk/jdk/jfr/javaagent/TestPremainAgent.java @@ -23,6 +23,7 @@ /** * @test + * @requires os.arch != "s390x" * @requires vm.flagless * @summary Tests emitting event before main using a Java agent * @requires vm.hasJFR diff --git a/test/jdk/jdk/jfr/jmx/streaming/TestClose.java b/test/jdk/jdk/jfr/jmx/streaming/TestClose.java index 08c302d6d4b1c..2907cdcf3a3dc 100644 --- a/test/jdk/jdk/jfr/jmx/streaming/TestClose.java +++ b/test/jdk/jdk/jfr/jmx/streaming/TestClose.java @@ -34,6 +34,7 @@ /** * @test + * @requires os.arch != "s390x" * @requires vm.flagless * @summary Tests that a RemoteRecordingStream can be closed * @requires vm.hasJFR diff --git a/test/jdk/jdk/jfr/jmx/streaming/TestMaxSize.java b/test/jdk/jdk/jfr/jmx/streaming/TestMaxSize.java index 5f49059437097..0c5b8ffd0bdb9 100644 --- a/test/jdk/jdk/jfr/jmx/streaming/TestMaxSize.java +++ b/test/jdk/jdk/jfr/jmx/streaming/TestMaxSize.java @@ -38,6 +38,7 @@ /** * @test + * @requires os.arch != "s390x" * @requires vm.flagless * @summary Tests that max size can be set for a RemoteRecordingStream * @requires vm.hasJFR diff --git a/test/jdk/jdk/jfr/jvm/TestChunkIntegrity.java b/test/jdk/jdk/jfr/jvm/TestChunkIntegrity.java index dc66d2617afcd..7e8b208bf6850 100644 --- a/test/jdk/jdk/jfr/jvm/TestChunkIntegrity.java +++ b/test/jdk/jdk/jfr/jvm/TestChunkIntegrity.java @@ -56,6 +56,7 @@ /** * @test + * @requires os.arch != "s390x" * @requires vm.hasJFR * @library /test/lib /test/jdk * @run main/othervm/timeout=300 jdk.jfr.jvm.TestChunkIntegrity diff --git a/test/jdk/jdk/jfr/jvm/TestJFRIntrinsic.java b/test/jdk/jdk/jfr/jvm/TestJFRIntrinsic.java index 75ed0d14ca508..eee753af4891c 100644 --- a/test/jdk/jdk/jfr/jvm/TestJFRIntrinsic.java +++ b/test/jdk/jdk/jfr/jvm/TestJFRIntrinsic.java @@ -24,6 +24,7 @@ /** * @test * @summary Intrinsic for JFR + * @requires os.arch != "s390x" * @requires vm.hasJFR * @library /test/lib * diff --git a/test/jdk/jdk/jfr/tool/TestDisassemble.java b/test/jdk/jdk/jfr/tool/TestDisassemble.java index 68088fdc5bb90..81fc6ce3f660b 100644 --- a/test/jdk/jdk/jfr/tool/TestDisassemble.java +++ b/test/jdk/jdk/jfr/tool/TestDisassemble.java @@ -40,6 +40,7 @@ * @test * @bug 8253050 * @summary Test jfr split + * @requires os.arch != "s390x" * @requires vm.flagless * @requires vm.hasJFR * @library /test/lib /test/jdk diff --git a/test/jdk/jdk/jfr/tool/TestScrub.java b/test/jdk/jdk/jfr/tool/TestScrub.java index 23a87452ff96b..3f6a5d2582e70 100644 --- a/test/jdk/jdk/jfr/tool/TestScrub.java +++ b/test/jdk/jdk/jfr/tool/TestScrub.java @@ -40,6 +40,7 @@ /** * @test * @summary Test jfr scrub + * @requires os.arch != "s390x" * @requires vm.flagless * @requires vm.hasJFR * @library /test/lib /test/jdk From bf123055f519d781617508a35b51efb14add1dd0 Mon Sep 17 00:00:00 2001 From: Vladimir Petko Date: Fri, 21 Nov 2025 15:07:59 +1300 Subject: [PATCH 2/2] fix(lint): add missing comma --- test/jdk/jdk/jfr/api/consumer/TestRecordingFileWrite.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/jdk/jdk/jfr/api/consumer/TestRecordingFileWrite.java b/test/jdk/jdk/jfr/api/consumer/TestRecordingFileWrite.java index f17f5661d3c20..7aac662cb905d 100644 --- a/test/jdk/jdk/jfr/api/consumer/TestRecordingFileWrite.java +++ b/test/jdk/jdk/jfr/api/consumer/TestRecordingFileWrite.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2025 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