1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8203003: Several FileDialog Modality Tests fail on Linux due to X errors

Browse Source 
Reviewed-by: prr, psadhukhan
This commit is contained in:
Sergey Bylokhov 2018-06-20 11:12:48 -07:00
parent 93c8d9bffd
commit dc6225338c
2 changed files with 65 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2018, 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
@ -547,6 +547,7 @@ GtkApi* gtk3_load(JNIEnv *env, const char* lib_name)
fp_g_path_get_dirname = dl_symbol("g_path_get_dirname");
fp_gdk_threads_init = dl_symbol("gdk_threads_init");
fp_gdk_threads_enter = dl_symbol("gdk_threads_enter");
fp_gdk_threads_leave = dl_symbol("gdk_threads_leave");
@ -626,10 +627,16 @@ GtkApi* gtk3_load(JNIEnv *env, const char* lib_name)
AWT_LOCK();
handler = XSetErrorHandler(NULL);
io_handler = XSetIOErrorHandler(NULL);
//According the GTK documentation, gdk_threads_init() should be
//called before gtk_init() or gtk_init_check()
fp_gdk_threads_init();
result = (*fp_gtk_init_check)(NULL, NULL);
XSetErrorHandler(handler);
XSetIOErrorHandler(io_handler);
AWT_UNLOCK();
/* Initialize widget array. */
for (i = 0; i < _GTK_WIDGET_TYPE_SIZE; i++)
{

6
test/jdk/ProblemList.txt
View File

@ -280,12 +280,12 @@ java/awt/Modal/FileDialog/FileDialogModal4Test.java 8198664 macosx-all
java/awt/Modal/FileDialog/FileDialogModal5Test.java 8198664 macosx-all
java/awt/Modal/FileDialog/FileDialogModal6Test.java 8198664 macosx-all
java/awt/Modal/FileDialog/FileDialogNonModal1Test.java 8198664 macosx-all
java/awt/Modal/FileDialog/FileDialogNonModal2Test.java 8198664,8203003 macosx-all,linux-all
java/awt/Modal/FileDialog/FileDialogNonModal2Test.java 8198664 macosx-all,linux-all
java/awt/Modal/FileDialog/FileDialogNonModal3Test.java 8198664 macosx-all
java/awt/Modal/FileDialog/FileDialogNonModal4Test.java 8198664 macosx-all
java/awt/Modal/FileDialog/FileDialogNonModal5Test.java 8198664 macosx-all
java/awt/Modal/FileDialog/FileDialogNonModal6Test.java 8198664,8203003 macosx-all,linux-all
java/awt/Modal/FileDialog/FileDialogNonModal7Test.java 8198664,8203003 macosx-all,linux-all
java/awt/Modal/FileDialog/FileDialogNonModal6Test.java 8198664 macosx-all,linux-all
java/awt/Modal/FileDialog/FileDialogNonModal7Test.java 8198664 macosx-all,linux-all
java/awt/Modal/FileDialog/FileDialogTKModal1Test.java 8196430 generic-all
java/awt/Modal/FileDialog/FileDialogTKModal2Test.java 8196430 generic-all
java/awt/Modal/FileDialog/FileDialogTKModal3Test.java 8196430 generic-all