summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorqiyao <qiyao>2013-10-11 07:27:45 +0000
committerqiyao <qiyao>2013-10-11 07:27:45 +0000
commit9c3eea2f53a791fe4f7624b68e3503fb2ae0d8b4 (patch)
treeabeb1f00e14918d013752ee7c76d21bb761b199b
parentdc5942c1b6a34378adb18097a56e919360d83997 (diff)
downloadgdb-9c3eea2f53a791fe4f7624b68e3503fb2ae0d8b4.tar.gz
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.
-rw-r--r--gdb/testsuite/ChangeLog8
-rw-r--r--gdb/testsuite/gdb.mi/mi-catch-load.c9
-rw-r--r--gdb/testsuite/gdb.mi/mi-catch-load.exp2
3 files changed, 18 insertions, 1 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index a9a3fb14b82..c2a15930656 100644
--- 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 83efda8bde4..8fa45ad6a48 100644
--- 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 64c1f1110a6..2b537ddfa69 100644
--- 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 {