From 3b9367636e6daaa559f7651f7aabedc5e394f4fc Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Mon, 11 May 2020 21:42:23 +0200
Subject: [PATCH] 8244676:
test/jdk/jdk/jfr/startupargs/TestOptionsWithLocale.java fails
Reviewed-by: mgronlun
---
test/jdk/jdk/jfr/startupargs/TestOptionsWithLocale.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/test/jdk/jdk/jfr/startupargs/TestOptionsWithLocale.java b/test/jdk/jdk/jfr/startupargs/TestOptionsWithLocale.java
index 1d1a79040f3..1942b3d3f63 100644
--- a/test/jdk/jdk/jfr/startupargs/TestOptionsWithLocale.java
+++ b/test/jdk/jdk/jfr/startupargs/TestOptionsWithLocale.java
@@ -16,7 +16,7 @@ import jdk.test.lib.process.ProcessTools;
* @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 class TestOptionsWithLocale {
}
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",