gdb/testsuite/

	* gdb.mi/mi-catch-load.c: Remove the include of "dlfcn.h".
	 [__WIN32__]: Include "windows.h" and define macro 'dlopen'
	 and 'dlclose'.
	[!__WIN32__]: Include "dlfcn.h".
	* gdb.mi/mi-catch-load.exp: Set up kfail.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index a9a3fb14b82fc0612a605524d4c91cb77190ab50..c2a159306567f524c9ea68016f89b8115b9f5cdd 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2013-10-11  Yao Qi  <yao@codesourcery.com>
+
+       * gdb.mi/mi-catch-load.c: Remove the include of "dlfcn.h".
+        [__WIN32__]: Include "windows.h" and define macro 'dlopen'
+        and 'dlclose'.
+       [!__WIN32__]: Include "dlfcn.h".
+       * gdb.mi/mi-catch-load.exp: Set up kfail.
+
 2013-10-10  Andreas Arnez  <arnez@linux.vnet.ibm.com>
 
        * lib/gdb.exp (gdb_core_cmd): Replace fixed string "re-load

diff --git a/gdb/testsuite/gdb.mi/mi-catch-load.c b/gdb/testsuite/gdb.mi/mi-catch-load.c
index 83efda8bde4d428b761b39018e7b00bba78a5c23..8fa45ad6a48b44962e76d8f4d1523d0dfd559d84 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-catch-load.c
+++ b/gdb/testsuite/gdb.mi/mi-catch-load.c
@@ -15,9 +15,16 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <dlfcn.h>
 #include <stdio.h>
 
+#ifdef __WIN32__
+#include <windows.h>
+#define dlopen(name, mode) LoadLibrary (TEXT (name))
+#define dlclose(handle) FreeLibrary (handle)
+#else
+#include <dlfcn.h>
+#endif
+
 char *libname = "mi-catch-load-so.so";
 
 int

diff --git a/gdb/testsuite/gdb.mi/mi-catch-load.exp b/gdb/testsuite/gdb.mi/mi-catch-load.exp
index 64c1f1110a61bfcac464e594479e652f90a7d48d..2b537ddfa69bd2f8d6c672bfddf2d24d87830c68 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-catch-load.exp
+++ b/gdb/testsuite/gdb.mi/mi-catch-load.exp
@@ -58,6 +58,7 @@ gdb_expect {
         pass "catch-load: solib-event stop"
     }
     -re ".*$mi_gdb_prompt$" {
+       setup_kfail mi/15945 *-*-*mingw*
         fail "catch-load: solib-event stop"
     }
     timeout {
@@ -85,6 +86,7 @@ gdb_expect {
         pass "catch-unload: solib-event stop"
     }
     -re ".*$mi_gdb_prompt$" {
+       setup_kfail mi/15945 *-*-*mingw*
         fail "catch-unload: solib-event stop"
     }
     timeout {