diff options
| author | Yao Qi <yao@codesourcery.com> | 2013-09-17 07:00:50 +0000 |
|---|---|---|
| committer | Yao Qi <yao@codesourcery.com> | 2013-09-17 07:00:50 +0000 |
| commit | 57b0d98e591b1fcb1ff008e98e042bb9183b595b (patch) | |
| tree | d978e2848071b3abc3e643941eb46224aea49fb9 | |
| parent | 3a86fc560024eff2964ca7c14d7ae4259e4d84e2 (diff) | |
| download | gdb-57b0d98e591b1fcb1ff008e98e042bb9183b595b.zip gdb-57b0d98e591b1fcb1ff008e98e042bb9183b595b.tar.gz gdb-57b0d98e591b1fcb1ff008e98e042bb9183b595b.tar.bz2 | |
gdb/testsuite/
* 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.
| -rw-r--r-- | gdb/testsuite/ChangeLog | 9 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/catch-load.c | 9 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/catch-load.exp | 2 |
3 files changed, 18 insertions, 2 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 328bdf3..8d34fb8 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,12 @@ +2013-09-17 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. + 2013-09-16 Doug Evans <dje@google.com> * lib/gdb.exp (using_fission): New proc. 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 { |