Skip to content

Commit

Permalink
8314832: Few runtime/os tests ignore vm flags
Browse files Browse the repository at this point in the history
Reviewed-by: dholmes, lmesnik
  • Loading branch information
Mikhailo Seledtsov committed Sep 12, 2023
1 parent 347beb2 commit fc3e826
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

5 comments on commit fc3e826

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

@GoeLin
Copy link
Member

@GoeLin GoeLin commented on fc3e826 Mar 13, 2024

Choose a reason for hiding this comment

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

/backport jdk21u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on fc3e826 Mar 13, 2024

Choose a reason for hiding this comment

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

@GoeLin the backport was successfully created on the branch backport-GoeLin-fc3e8266 in my personal fork of openjdk/jdk21u-dev. To create a pull request with this backport targeting openjdk/jdk21u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit fc3e8266 from the openjdk/jdk repository.

The commit being backported was authored by Mikhailo Seledtsov on 12 Sep 2023 and was reviewed by David Holmes and Leonid Mesnik.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk21u-dev:

$ git fetch https://github.com/openjdk-bots/jdk21u-dev.git backport-GoeLin-fc3e8266:backport-GoeLin-fc3e8266
$ git checkout backport-GoeLin-fc3e8266
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk21u-dev.git backport-GoeLin-fc3e8266

@GoeLin
Copy link
Member

@GoeLin GoeLin commented on fc3e826 Mar 20, 2024

Choose a reason for hiding this comment

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

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on fc3e826 Mar 20, 2024

Choose a reason for hiding this comment

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

@GoeLin the backport was successfully created on the branch backport-GoeLin-fc3e8266 in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit fc3e8266 from the openjdk/jdk repository.

The commit being backported was authored by Mikhailo Seledtsov on 12 Sep 2023 and was reviewed by David Holmes and Leonid Mesnik.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev:

$ git fetch https://github.com/openjdk-bots/jdk17u-dev.git backport-GoeLin-fc3e8266:backport-GoeLin-fc3e8266
$ git checkout backport-GoeLin-fc3e8266
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev.git backport-GoeLin-fc3e8266

Please sign in to comment.