commit b1025940e2c2eba9494013550b9b8a08803b274a
author Vitaly Provodin <vitaly.provodin@jetbrains.com> Fri Jan 27 11:32:59 2017 +0700
committer Alexey Ushakov <Alexey.Ushakov@jetbrains.com> Fri Mar 31 16:48:27 2017 +0300
tree 78b0e7d8cdcd8a4403d08092653185c15d92a5b0
parent 7171ae0e2fd8f6817096ef800da23f7c34832939

backported the fix for JDK-7146533

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

diff --git a/test/java/awt/xembed/server/RunTestXEmbed.java b/test/java/awt/xembed/server/RunTestXEmbed.java
index f91d345..d09b51b 100644
--- a/test/java/awt/xembed/server/RunTestXEmbed.java
+++ b/test/java/awt/xembed/server/RunTestXEmbed.java
@@ -23,9 +23,13 @@
 
 /**
  * @test
- * @bug 4931668
+ * @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
  */
@@ -92,7 +96,7 @@
     }
 
     public static void main(String[] args) throws Throwable {
-        if (System.getProperty("os.name").toLowerCase().startsWith("win")) {
+        if (Platform.isWindows() || Platform.isOSX()) {
             return;
         }
 

test/jbProblemsList.txt

diff --git a/test/jbProblemsList.txt b/test/jbProblemsList.txt
index 1795045..87aa070 100644
--- a/test/jbProblemsList.txt
+++ b/test/jbProblemsList.txt
@@ -655,8 +655,9 @@
 
 
 ## https://bugs.openjdk.java.net/browse/JDK-6560348
-# https://bugs.openjdk.java.net/browse/JDK-7146533
-java/awt/xembed/server/RunTestXEmbed.java                            generic-all
+## https://bugs.openjdk.java.net/browse/JDK-7146533
+# fix was backported
+#java/awt/xembed/server/RunTestXEmbed.java                            generic-all
 
 ############################################################################