JBR-8572 Wayland: java/awt/Desktop/DesktopGtkLoadTest/DesktopGtkLoadTest.java: Wrong GTK library version: null

Author: mkartashev

src/java.desktop/unix/native/libawt_wlawt/gtk_interface.h

@@ -440,8 +440,8 @@ static const gint DEFAULT    = 1 << 10;
 
 typedef enum
 {
-  GTK_ANY,
-  GTK_3
+  GTK_ANY = 0,
+  GTK_3   = 3
 } GtkVersion;
 
 typedef enum {

test/jdk/java/awt/Desktop/DesktopGtkLoadTest/DesktopGtkLoadTest.java

@@ -28,9 +28,12 @@
  * @summary AWT_Desktop/Automated/Exceptions/BasicTest loads incorrect GTK
  * version when jdk.gtk.version=3
  * @requires (os.family == "linux")
+ * @library /test/lib
  * @run main DesktopGtkLoadTest
  */
 
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
 
 import java.awt.*;
 import java.io.*;
@@ -43,26 +46,14 @@ public static void main(String[] args) {
     }
 
     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);
-        }
-
+        final ProcessBuilder pbJava = ProcessTools.createTestJavaProcessBuilder(
+                "-Djdk.gtk.version=3",
+                "-Djdk.gtk.verbose=true",
+                RunDesktop.class.getName()
+        );
+        final OutputAnalyzer output = ProcessTools.executeProcess(pbJava);
+        output.shouldNotContain("Looking for GTK2 library");
+        output.shouldContain("Looking for GTK3 library");
     }
 
 }