diff options
| author | Vitaly Provodin <vitaly.provodin@jetbrains.com> | 2017-01-27 11:32:59 +0700 |
|---|---|---|
| committer | Alexey Ushakov <Alexey.Ushakov@jetbrains.com> | 2017-03-31 16:48:27 +0300 |
| commit | b1025940e2c2eba9494013550b9b8a08803b274a (patch) | |
| tree | 78b0e7d8cdcd8a4403d08092653185c15d92a5b0 /test/java | |
| parent | 7171ae0e2fd8f6817096ef800da23f7c34832939 (diff) | |
| download | jdk8u_jdk-b1025940e2c2eba9494013550b9b8a08803b274a.tar.gz | |
backported the fix for JDK-7146533
Diffstat (limited to 'test/java')
| -rw-r--r-- | test/java/awt/xembed/server/RunTestXEmbed.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/test/java/awt/xembed/server/RunTestXEmbed.java b/test/java/awt/xembed/server/RunTestXEmbed.java index f91d345d87..d09b51b5ed 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 class RunTestXEmbed extends TestXEmbedServer { } public static void main(String[] args) throws Throwable { - if (System.getProperty("os.name").toLowerCase().startsWith("win")) { + if (Platform.isWindows() || Platform.isOSX()) { return; } |