Skip to content

Commit

Permalink
8265486: ProblemList javax/sound/midi/Sequencer/Recording.java on mac…
Browse files Browse the repository at this point in the history
…osx-aarch64

Reviewed-by: prr, serb
  • Loading branch information
vidmik committed Apr 19, 2021
1 parent e0fd5fc commit ab22407
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion test/jdk/ProblemList.txt
Expand Up @@ -721,7 +721,7 @@ javax/sound/sampled/Clip/Drain/ClipDrain.java 7062792 generic-all

javax/sound/sampled/Mixers/DisabledAssertionCrash.java 7067310 generic-all

javax/sound/midi/Sequencer/Recording.java 8167580 linux-all
javax/sound/midi/Sequencer/Recording.java 8167580,8265485 linux-all,macosx-aarch64
javax/sound/midi/Sequencer/MetaCallback.java 8178698 linux-all

############################################################################
Expand Down

3 comments on commit ab22407

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

@RealCLanger
Copy link
Contributor

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 ab22407 Mar 16, 2023

Choose a reason for hiding this comment

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

@RealCLanger Could not automatically backport ab224074 to openjdk/jdk11u-dev due to conflicts in the following files:

  • test/jdk/ProblemList.txt

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 master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b RealCLanger-backport-ab224074

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

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

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

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

Please sign in to comment.