Skip to content

Commit

Permalink
8331495: Limit BasicDirectoryModel/LoaderThreadCount.java to Windows …
Browse files Browse the repository at this point in the history
…only

Reviewed-by: prr
  • Loading branch information
aivanov-jdk committed May 1, 2024
1 parent e833bfc commit 2a95cd4
Showing 1 changed file with 1 addition and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
/*
* @test
* @bug 8325179
* @requires os.family == "windows"
* @summary Verifies there's only one BasicDirectoryModel.FilesLoader thread
* at any given moment
* @run main/othervm -Djava.awt.headless=true LoaderThreadCount
Expand Down

3 comments on commit 2a95cd4

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

@luchenlin
Copy link

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 2a95cd4 Jun 14, 2024

Choose a reason for hiding this comment

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

@luchenlin Could not automatically backport 2a95cd47 to openjdk/jdk21u-dev due to conflicts in the following files:

  • test/jdk/javax/swing/plaf/basic/BasicDirectoryModel/LoaderThreadCount.java

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk21u-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/jdk21u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b backport-luchenlin-2a95cd47-master

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

# Backport the commit
$ git cherry-pick --no-commit 2a95cd473aaefcacd976d1c17aa2badf330a6c32
# Resolve conflicts now

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

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk21u-dev with the title Backport 2a95cd473aaefcacd976d1c17aa2badf330a6c32.

Below you can find a suggestion for the pull request body:

Hi all,

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

The commit being backported was authored by Alexey Ivanov on 1 May 2024 and was reviewed by Phil Race.

Thanks!

Please sign in to comment.