Skip to content

Commit

Permalink
8314832: Few runtime/os tests ignore vm flags
Browse files Browse the repository at this point in the history
Backport-of: fc3e8266929826f8e58bc76fe97423d76bc7be87
  • Loading branch information
GoeLin committed Mar 21, 2024
1 parent 6359b28 commit 9922f22
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
* @bug 8303215 8312182
* @summary On THP=always systems, we prevent THPs from forming within thread stacks
* @library /test/lib
* @requires vm.flagless
* @requires os.family == "linux"
* @requires vm.debug
* @requires os.arch=="amd64" | os.arch=="x86_64" | os.arch=="aarch64"
Expand All @@ -40,6 +41,7 @@
* @bug 8303215 8312182
* @summary On THP=always systems, we prevent THPs from forming within thread stacks (negative test)
* @library /test/lib
* @requires vm.flagless
* @requires os.family == "linux"
* @requires vm.debug
* @requires os.arch=="amd64" | os.arch=="x86_64" | os.arch=="aarch64"
Expand Down
1 change: 1 addition & 0 deletions test/hotspot/jtreg/runtime/os/TestHugePageDetection.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
* @test
* @summary Test that the JVM detects the OS hugepage/THP settings correctly.
* @library /test/lib
* @requires vm.flagless
* @requires os.family == "linux"
* @modules java.base/jdk.internal.misc
* java.management
Expand Down
8 changes: 8 additions & 0 deletions test/hotspot/jtreg/runtime/os/TestTrimNative.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

/*
* @test id=trimNative
* @requires vm.flagless
* @requires (os.family=="linux") & !vm.musl
* @modules java.base/jdk.internal.misc
* @library /test/lib
Expand All @@ -36,6 +37,7 @@

/*
* @test id=trimNativeStrict
* @requires vm.flagless
* @requires (os.family=="linux") & !vm.musl
* @modules java.base/jdk.internal.misc
* @library /test/lib
Expand All @@ -47,6 +49,7 @@
/*
* @test id=trimNativeHighInterval
* @summary High interval trimming should not even kick in for short program runtimes
* @requires vm.flagless
* @requires (os.family=="linux") & !vm.musl
* @modules java.base/jdk.internal.misc
* @library /test/lib
Expand All @@ -58,6 +61,7 @@
/*
* @test id=trimNativeLowInterval
* @summary Very low (sub-second) interval, nothing should explode
* @requires vm.flagless
* @requires (os.family=="linux") & !vm.musl
* @modules java.base/jdk.internal.misc
* @library /test/lib
Expand All @@ -69,6 +73,7 @@
/*
* @test id=trimNativeLowIntervalStrict
* @summary Very low (sub-second) interval, nothing should explode (stricter test, manual mode)
* @requires vm.flagless
* @requires (os.family=="linux") & !vm.musl
* @modules java.base/jdk.internal.misc
* @library /test/lib
Expand All @@ -80,6 +85,7 @@
/*
* @test id=testOffByDefault
* @summary Test that trimming is disabled by default
* @requires vm.flagless
* @requires (os.family=="linux") & !vm.musl
* @modules java.base/jdk.internal.misc
* @library /test/lib
Expand All @@ -91,6 +97,7 @@
/*
* @test id=testOffExplicit
* @summary Test that trimming can be disabled explicitly
* @requires vm.flagless
* @requires (os.family=="linux") & !vm.musl
* @modules java.base/jdk.internal.misc
* @library /test/lib
Expand All @@ -102,6 +109,7 @@
/*
* @test id=testOffOnNonCompliantPlatforms
* @summary Test that trimming is correctly reported as unavailable if unavailable
* @requires vm.flagless
* @requires (os.family!="linux") | vm.musl
* @modules java.base/jdk.internal.misc
* @library /test/lib
Expand Down

1 comment on commit 9922f22

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.