Mercurial > hg > openjdk > jdk9 > jdk

changeset 14236:083660214bea

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8152693: Changed behavior of java/awt/xembed/server/TestXEmbedServerJava.java test Reviewed-by: ssadetsky, serb
author yan
date Wed, 06 Apr 2016 14:44:32 +0300
parents 01419d57f47c
children 282fa37a9dc4
files test/java/awt/xembed/server/TestXEmbedServerJava.java
diffstat 1 files changed, 17 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/test/java/awt/xembed/server/TestXEmbedServerJava.java	Wed Apr 06 12:25:21 2016 +0530
+++ b/test/java/awt/xembed/server/TestXEmbedServerJava.java	Wed Apr 06 14:44:32 2016 +0300
@@ -76,7 +76,23 @@
     public Process startClient(Rectangle[] bounds, long window) {
         try {
             String java_home = System.getProperty("java.home");
-            return Runtime.getRuntime().exec(java_home + "/bin/java  -XaddExports:java.desktop/sun.awt.X11=ALL-UNNAMED  JavaClient " + window);
+            boolean hasModules = true;
+            try {
+                Class.class.getMethod("getModule");
+            }catch(Exception hasModulesEx) {
+                hasModules = false;
+            }
+            if (hasModules) {
+                System.out.println(java_home +
+                               "/bin/java  -XaddExports:java.desktop/sun.awt.X11=ALL-UNNAMED "+
+                               "-XaddExports:java.desktop/sun.awt=ALL-UNNAMED  JavaClient " + window);
+                return Runtime.getRuntime().exec(java_home +
+                               "/bin/java  -XaddExports:java.desktop/sun.awt.X11=ALL-UNNAMED "+
+                               "-XaddExports:java.desktop/sun.awt=ALL-UNNAMED  JavaClient " + window);
+            }else{
+                System.out.println(java_home + "/bin/java JavaClient " + window);
+                return Runtime.getRuntime().exec(java_home + "/bin/java JavaClient " + window);
+            }
         } catch (IOException ex1) {
             ex1.printStackTrace();
         }