changeset 15296:fe0a90c63dce

8157827: AWT_Desktop/Automated/Exceptions/BasicTest loads incorrect GTK version when jdk.gtk.version=3 Reviewed-by: prr
author ssadetsky
date Fri, 29 Jul 2016 11:25:59 +0300
parents 900dde7b4a68
children 45b3bb1b2c10
files src/java.desktop/unix/classes/sun/awt/X11/XDesktopPeer.java test/java/awt/Desktop/DesktopGtkLoadTest/DesktopGtkLoadTest.java
diffstat 2 files changed, 67 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.desktop/unix/classes/sun/awt/X11/XDesktopPeer.java	Fri Jul 29 11:19:28 2016 +0300
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XDesktopPeer.java	Fri Jul 29 11:25:59 2016 +0300
@@ -60,7 +60,7 @@
         try {
             if (!initExecuted) {
                 nativeLibraryLoaded = init(UNIXToolkit.getEnabledGtkVersion()
-                        .ordinal(), UNIXToolkit.isGtkVerbose());
+                        .getNumber(), UNIXToolkit.isGtkVerbose());
             }
         } finally {
             initExecuted = true;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/java/awt/Desktop/DesktopGtkLoadTest/DesktopGtkLoadTest.java	Fri Jul 29 11:25:59 2016 +0300
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 8157827
+ * @summary AWT_Desktop/Automated/Exceptions/BasicTest loads incorrect GTK
+ * version when jdk.gtk.version=3
+ * @requires (os.family == "linux")
+ * @run main DesktopGtkLoadTest
+ */
+
+
+import java.awt.*;
+import java.io.*;
+
+public class DesktopGtkLoadTest {
+    public static class RunDesktop {
+        public static void main(String[] args) {
+            Desktop.getDesktop();
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        Process p = Runtime.getRuntime().exec(System.getProperty("java.home") +
+                "/bin/java -Djdk.gtk.version=3 -Djdk.gtk.verbose=true " +
+                "-cp " + System.getProperty("java.class.path", ".") +
+                " DesktopGtkLoadTest$RunDesktop");
+        p.waitFor();
+        try (BufferedReader br = new BufferedReader(
+                                   new InputStreamReader(p.getErrorStream()))) {
+            String line;
+            while ((line = br.readLine()) != null) {
+                System.out.println(line);
+                if (line.contains("Looking for GTK2 library")) {
+                    break;
+                }
+                if (line.contains("Looking for GTK3 library")) {
+                    return;
+                }
+            }
+            throw new RuntimeException("Wrong GTK library version: \n" + line);
+        }
+
+    }
+
+}