changeset 59243:34a299b47cd0

8244676: test/jdk/jdk/jfr/startupargs/TestOptionsWithLocale.java fails Reviewed-by: mgronlun
author egahlin
date Mon, 11 May 2020 21:42:23 +0200
parents 1d1c57304400
children e8cebbd8dfac
files test/jdk/jdk/jfr/startupargs/TestOptionsWithLocale.java
diffstat 1 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/test/jdk/jdk/jfr/startupargs/TestOptionsWithLocale.java	Mon May 11 15:29:52 2020 -0400
+++ b/test/jdk/jdk/jfr/startupargs/TestOptionsWithLocale.java	Mon May 11 21:42:23 2020 +0200
@@ -16,7 +16,7 @@
  * @requires vm.hasJFR
  * @modules jdk.jfr
  * @library /test/lib
- * @run main jdk.jfr.startupargs.TestOptionsWithLocale
+ * @run main/othervm jdk.jfr.startupargs.TestOptionsWithLocale
  */
 public class TestOptionsWithLocale {
 
@@ -29,6 +29,13 @@
     }
 
     public static void main(String... args) throws IOException {
+        // Can only run test if jdk.localedata is available.
+        // Can't specify @module jdk.jfr jdk.localedata, because
+        // --limit-modules jdk.jfr,jdk.localedata prevents the product issue.
+        if (ModuleLayer.boot().findModule("jdk.localedata").isEmpty()) {
+            return;
+        }
+
         ProcessBuilder pb = ProcessTools.createTestJvm(
                 "-Duser.country=DE",
                 "-Duser.language=de",