Skip to content

Commit

Permalink
8271224: runtime/EnclosingMethodAttr/EnclMethodAttr.java doesn't chec…
Browse files Browse the repository at this point in the history 
…k exit code

Reviewed-by: mseledtsov, dholmes
  • Loading branch information
@iignatev
iignatev committed Aug 4, 2021
1 parent 34ba70a commit 68dd828
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion test/hotspot/jtreg/runtime/EnclosingMethodAttr/EnclMethodAttr.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -44,6 +44,7 @@ public static void main(String args[]) throws Throwable {
System.out.println("Regression test for bug 8044738");
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("EnclMethTest");
OutputAnalyzer output = new OutputAnalyzer(pb.start());
output.shouldNotHaveExitValue(0);
output.shouldContain("java.lang.ClassFormatError: Wrong EnclosingMethod");
}
}
Expand Down

5 comments on commit 68dd828

@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

@GoeLin
Copy link
Member

@GoeLin GoeLin commented on 68dd828 Mar 9, 2022

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 68dd828 Mar 9, 2022

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 GoeLin-backport-68dd8280 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 68dd8280 from the openjdk/jdk repository.

The commit being backported was authored by Igor Ignatyev on 4 Aug 2021 and was reviewed by Mikhailo Seledtsov and David Holmes.

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 GoeLin-backport-68dd8280:GoeLin-backport-68dd8280
$ git checkout GoeLin-backport-68dd8280
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev GoeLin-backport-68dd8280

@luchenlin
Copy link

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 68dd828 Dec 26, 2023

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 68dd8280 to openjdk/jdk11u-dev due to conflicts in the following files:

  • test/hotspot/jtreg/runtime/EnclosingMethodAttr/EnclMethodAttr.java

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 backport-luchenlin-68dd8280

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

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

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

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

Please sign in to comment.