From: Yao Qi <yao@codesourcery.com>
To: <gdb-patches@sourceware.org>
Subject: [PATCH] Run catch-load.exp on Windows
Date: Thu, 12 Sep 2013 01:00:00 -0000 [thread overview]
Message-ID: <1378947563-26245-1-git-send-email-yao@codesourcery.com> (raw)
Hi,
I find a compilation error when catch-load.c is compiled.
catch-load.c:18:19: fatal error: dlfcn.h: No such file or directory
This patch is to fix this compilation error. With this patch applied,
test case can be compiled successfully. However, there is one fail
caused by matching "/" in file name, which doesn't exist on Windows.
This patch fixes it by matching either "/" or "\" in file name.
gdb/testsuite:
2013-09-12 Yao Qi <yao@codesourcery.com>
* gdb.base/catch-load.c: Remove the include of "dlfcn.h".
[__WIN32__]: Include "windows.h" and define macro dlopen
and dlclose.
[!__WIN32__]: Include "dlfcn.h".
* gdb.base/catch-load.exp (one_catch_load_test): Match
directory separator.
---
gdb/testsuite/gdb.base/catch-load.c | 9 ++++++++-
gdb/testsuite/gdb.base/catch-load.exp | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/gdb/testsuite/gdb.base/catch-load.c b/gdb/testsuite/gdb.base/catch-load.c
index 9a0010e..33c0a66 100644
--- a/gdb/testsuite/gdb.base/catch-load.c
+++ b/gdb/testsuite/gdb.base/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
+
/* This is updated by the .exp file. */
char *libname = "catch-load-so.so";
diff --git a/gdb/testsuite/gdb.base/catch-load.exp b/gdb/testsuite/gdb.base/catch-load.exp
index 4bcaa44..28445b8 100644
--- a/gdb/testsuite/gdb.base/catch-load.exp
+++ b/gdb/testsuite/gdb.base/catch-load.exp
@@ -64,7 +64,7 @@ proc one_catch_load_test {scenario kind match sostop} {
gdb_test "catch $kind" "Catchpoint $decimal \\(.*\\)"
gdb_test_multiple "continue" "continue" {
- -re "Catchpoint $decimal\r\n.*loaded .*/$testfile2.*\r\n.*$gdb_prompt $" {
+ -re "Catchpoint $decimal\r\n.*loaded .*(\\\\|/)$testfile2.*\r\n.*$gdb_prompt $" {
if {$match} {
pass "continue"
} else {
--
1.7.7.6
next reply other threads:[~2013-09-12 1:00 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-12 1:00 Yao Qi [this message]
2013-09-12 2:44 ` Eli Zaretskii
2013-09-12 11:38 ` Yao Qi
2013-09-12 15:36 ` Pierre Muller
2013-09-16 13:21 ` Yao Qi
2013-09-16 14:26 ` Pedro Alves
2013-09-16 16:24 ` Pierre Muller
[not found] ` <33630.1438547254$1379000229@news.gmane.org>
2013-09-17 18:39 ` Tom Tromey
2013-09-16 14:22 ` Pedro Alves
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1378947563-26245-1-git-send-email-yao@codesourcery.com \
--to=yao@codesourcery.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox