Skip to content

Commit

Permalink
8320714: java/util/Locale/LocaleProvidersRun.java and java/util/Resou…
Browse files Browse the repository at this point in the history
…rceBundle/modules/visibility/VisibilityTest.java timeout after passing

Reviewed-by: naoto, bpb, lancea
  • Loading branch information
Justin Lu committed Nov 28, 2023
1 parent 66ae6d5 commit 69c0b24
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
5 changes: 3 additions & 2 deletions test/jdk/java/util/Locale/LocaleProvidersRun.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
* 8150432 8215913 8220227 8228465 8232871 8232860 8236495 8245241
* 8246721 8248695 8257964 8261919
* @summary tests for "java.locale.providers" system property
* @requires vm.flagless
* @library /test/lib
* @build LocaleProviders
* providersrc.spi.src.tznp
Expand Down Expand Up @@ -179,8 +180,8 @@ public static void main(String[] args) throws Throwable {
private static void testRun(String prefList, String methodName,
String param1, String param2, String param3) throws Throwable {

// Build process (with VM flags)
ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(
// Build process (without VM flags)
ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
"-ea", "-esa",
"-cp", Utils.TEST_CLASS_PATH,
"-Djava.util.logging.config.class=LocaleProviders$LogConfig",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
* @bug 8137317 8139238 8210408
* @summary Visibility tests for ResourceBundle.getBundle with and without
* an unnamed module argument.
* @requires vm.flagless
* @library /test/lib
* ..
* @build jdk.test.lib.JDKToolLauncher
Expand Down Expand Up @@ -330,8 +331,8 @@ public void RunWithPkgRes(List<String> argsList) throws Throwable {
}

private int runCmd(List<String> argsList) throws Throwable {
// Build process (with VM flags)
ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(
// Build process (without VM flags)
ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
Stream.concat(Stream.of("-ea", "-esa"), argsList.stream()).toList());
// Evaluate process status
return ProcessTools.executeCommand(pb).getExitValue();
Expand Down

3 comments on commit 69c0b24

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

@GoeLin
Copy link
Member

@GoeLin GoeLin commented on 69c0b24 Apr 12, 2024

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 69c0b24 Apr 12, 2024

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 backport-GoeLin-69c0b243 in my personal fork of openjdk/jdk21u-dev. To create a pull request with this backport targeting openjdk/jdk21u-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 69c0b243 from the openjdk/jdk repository.

The commit being backported was authored by Justin Lu on 28 Nov 2023 and was reviewed by Naoto Sato, Brian Burkhalter and Lance Andersen.

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/jdk21u-dev:

$ git fetch https://github.com/openjdk-bots/jdk21u-dev.git backport-GoeLin-69c0b243:backport-GoeLin-69c0b243
$ git checkout backport-GoeLin-69c0b243
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk21u-dev.git backport-GoeLin-69c0b243

Please sign in to comment.