Skip to content

Commit

Permalink
8320601: ProblemList java/lang/invoke/lambda/LambdaFileEncodingSerial…
Browse files Browse the repository at this point in the history
…ization.java on linux-all

Backport-of: f6e5559ae9d1c8b84b31af5d36e93b43e7731ba5
  • Loading branch information
RealCLanger committed Nov 28, 2023
1 parent f8706d1 commit ab7380e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion test/jdk/ProblemList.txt
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ java/beans/XMLEncoder/Test6570354.java 8015593 macosx-all
java/lang/ProcessHandle/InfoTest.java 8211847 aix-ppc64
java/lang/invoke/LFCaching/LFMultiThreadCachingTest.java 8151492 generic-all
java/lang/invoke/LFCaching/LFGarbageCollectedTest.java 8078602 generic-all
java/lang/invoke/lambda/LambdaFileEncodingSerialization.java 8249079 linux-x64
java/lang/invoke/lambda/LambdaFileEncodingSerialization.java 8249079 linux-all
java/lang/invoke/RicochetTest.java 8251969 generic-all

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

3 comments on commit ab7380e

@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 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 ab7380e Nov 28, 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 ab7380e2 to openjdk/jdk17u-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/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 RealCLanger-backport-ab7380e2

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

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

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

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

Please sign in to comment.