test/java/awt/xembed/server/RunTestXEmbed.java

*** 26,46 ****
   * @bug 4931668 7146533
   * @summary Tests XEmbed server/client functionality
   * @author Denis Mikhalkin: area=awt.xembed
   * @requires (!(os.family=="mac") & !(os.family=="windows"))
   * @library /lib/testlibrary
-  * @build jdk.testlibrary.Platform
   * @modules java.desktop/sun.awt
   * @compile JavaClient.java TesterClient.java TestXEmbedServer.java
   * @run main/timeout=6000 RunTestXEmbed
   */
  
  import java.awt.Rectangle;
  import java.lang.reflect.Method;
  import java.util.logging.*;
  import java.util.*;
  import java.io.*;
  
  public class RunTestXEmbed extends TestXEmbedServer {
      private static final Logger log = Logger.getLogger("test.xembed");
      private Method test;
      private boolean passed = false;
--- 26,47 ----
   * @bug 4931668 7146533
   * @summary Tests XEmbed server/client functionality
   * @author Denis Mikhalkin: area=awt.xembed
   * @requires (!(os.family=="mac") & !(os.family=="windows"))
   * @library /lib/testlibrary
   * @modules java.desktop/sun.awt
+  * @build jdk.testlibrary.Platform
   * @compile JavaClient.java TesterClient.java TestXEmbedServer.java
   * @run main/timeout=6000 RunTestXEmbed
   */
  
  import java.awt.Rectangle;
  import java.lang.reflect.Method;
  import java.util.logging.*;
  import java.util.*;
  import java.io.*;
+ import jdk.testlibrary.Platform;
  
  public class RunTestXEmbed extends TestXEmbedServer {
      private static final Logger log = Logger.getLogger("test.xembed");
      private Method test;
      private boolean passed = false;
*** 70,80 ****
                  } else {
                      enva[ind++] = "AWT_TOOLKIT=sun.awt.X11.XToolkit";
                  }
              }
              Process proc = Runtime.getRuntime().exec(java_home +
!                                                      "/bin/java -Dawt.toolkit=sun.awt.X11.XToolkit TesterClient "
                                                       + test.getName() + " " + window + buf,
                                                       enva);
              System.err.println("Test for " + test.getName() + " has started.");
              log.fine("Test for " + test.getName() + " has started.");
              new InputReader(proc.getInputStream());
--- 71,81 ----
                  } else {
                      enva[ind++] = "AWT_TOOLKIT=sun.awt.X11.XToolkit";
                  }
              }
              Process proc = Runtime.getRuntime().exec(java_home +
!                                                      "/bin/java -XaddExports:java.desktop/sun.awt.X11=ALL-UNNAMED -Dawt.toolkit=sun.awt.X11.XToolkit TesterClient "
                                                       + test.getName() + " " + window + buf,
                                                       enva);
              System.err.println("Test for " + test.getName() + " has started.");
              log.fine("Test for " + test.getName() + " has started.");
              new InputReader(proc.getInputStream());