Skip to content

Commit

Permalink
8315214: Do not run sun/tools/jhsdb tests concurrently
Browse files Browse the repository at this point in the history 
Reviewed-by: alanb, cjplummer
  • Loading branch information
@MBaesken
MBaesken committed Aug 30, 2023
1 parent ce2a7ea commit 1e7e2bc
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion test/jdk/TEST.ROOT
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ exclusiveAccess.dirs=java/math/BigInteger/largeMemory \
java/rmi/Naming java/util/prefs sun/management/jmxremote \
sun/tools/jstatd sun/security/mscapi java/util/Arrays/largeMemory \
java/util/BitSet/stream javax/rmi java/net/httpclient/websocket \
com/sun/net/httpserver/simpleserver
com/sun/net/httpserver/simpleserver sun/tools/jhsdb

# Group definitions
groups=TEST.groups
Expand Down

7 comments on commit 1e7e2bc

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

Review

Issues

@MBaesken
Copy link
Member Author

Choose a reason for hiding this comment

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

/backport jdk21u

@openjdk
Copy link

@openjdk openjdk bot commented on 1e7e2bc Sep 8, 2023

Choose a reason for hiding this comment

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

@MBaesken the backport was successfully created on the branch MBaesken-backport-1e7e2bcf in my personal fork of openjdk/jdk21u. To create a pull request with this backport targeting openjdk/jdk21u: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 1e7e2bcf from the openjdk/jdk repository.

The commit being backported was authored by Matthias Baesken on 30 Aug 2023 and was reviewed by Alan Bateman and Chris Plummer.

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:

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

@MBaesken
Copy link
Member Author

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 1e7e2bc Oct 16, 2023

Choose a reason for hiding this comment

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

@MBaesken Could not automatically backport 1e7e2bcf to openjdk/jdk17u-dev due to conflicts in the following files:

  • test/jdk/TEST.ROOT

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk17u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk17u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b MBaesken-backport-1e7e2bcf

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk.git 1e7e2bcf3560e1ad39516fb604e4d8bf85bb54e0

# Backport the commit
$ git cherry-pick --no-commit 1e7e2bcf3560e1ad39516fb604e4d8bf85bb54e0
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 1e7e2bcf3560e1ad39516fb604e4d8bf85bb54e0'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk17u-dev with the title Backport 1e7e2bcf3560e1ad39516fb604e4d8bf85bb54e0.

@MBaesken
Copy link
Member Author

Choose a reason for hiding this comment

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

/backport jdk11u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 1e7e2bc Oct 31, 2023

Choose a reason for hiding this comment

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

@MBaesken Could not automatically backport 1e7e2bcf to openjdk/jdk11u-dev due to conflicts in the following files:

  • test/jdk/TEST.ROOT

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk11u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk11u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b MBaesken-backport-1e7e2bcf

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk.git 1e7e2bcf3560e1ad39516fb604e4d8bf85bb54e0

# Backport the commit
$ git cherry-pick --no-commit 1e7e2bcf3560e1ad39516fb604e4d8bf85bb54e0
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 1e7e2bcf3560e1ad39516fb604e4d8bf85bb54e0'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk11u-dev with the title Backport 1e7e2bcf3560e1ad39516fb604e4d8bf85bb54e0.

Please sign in to comment.