Skip to content

Commit

Permalink
8331518: Tests should not use the "Classpath" exception form of the l…
Browse files Browse the repository at this point in the history 
…egal header

Reviewed-by: dholmes
  • Loading branch information
@TobiHartmann
TobiHartmann committed May 2, 2024
1 parent 4036d7d commit d3bf526
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 15 deletions.
4 changes: 1 addition & 3 deletions test/hotspot/jtreg/compiler/c2/TestUninitializedKlassField.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
Expand Down
4 changes: 1 addition & 3 deletions test/hotspot/jtreg/compiler/codegen/TestConvertImplicitNullCheck.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
Expand Down
4 changes: 1 addition & 3 deletions test/hotspot/jtreg/compiler/loopopts/TestPartialPeelingAtSingleInputRegion.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
Expand Down
4 changes: 1 addition & 3 deletions test/micro/org/openjdk/bench/java/lang/foreign/libToJavaString.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
Expand Down
4 changes: 1 addition & 3 deletions test/micro/org/openjdk/bench/vm/compiler/MergeStores.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
Expand Down

3 comments on commit d3bf526

@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

@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 d3bf526 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 d3bf5262 to openjdk/jdk21u-dev due to conflicts in the following files:

  • test/micro/org/openjdk/bench/java/lang/foreign/libToJavaString.c
  • test/micro/org/openjdk/bench/vm/compiler/MergeStores.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-d3bf5262-master

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

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

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

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

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

Hi all,

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

The commit being backported was authored by Tobias Hartmann on 2 May 2024 and was reviewed by David Holmes.

Thanks!

Please sign in to comment.