diff options
Diffstat (limited to 'gdb/testsuite/lib')
| -rw-r--r-- | gdb/testsuite/lib/arc-gdbserver.exp | 98 | ||||
| -rw-r--r-- | gdb/testsuite/lib/arc-jtag.exp | 32 | ||||
| -rw-r--r-- | gdb/testsuite/lib/gdb.exp | 16 | ||||
| -rw-r--r-- | gdb/testsuite/lib/gdbserver-support.exp | 4 | ||||
| -rw-r--r-- | gdb/testsuite/lib/mi-support.exp | 13 | ||||
| -rw-r--r-- | gdb/testsuite/lib/telnet-exec.exp | 29 |
6 files changed, 28 insertions, 164 deletions
diff --git a/gdb/testsuite/lib/arc-gdbserver.exp b/gdb/testsuite/lib/arc-gdbserver.exp deleted file mode 100644 index 6674e9240d0..00000000000 --- a/gdb/testsuite/lib/arc-gdbserver.exp +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software -# Foundation, Inc. -# -# This file is part of DejaGnu. -# -# DejaGnu is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# DejaGnu is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with DejaGnu; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -# gdbserver running cross - -#load the config file -load_generic_config "remote-gdbserver" - - -process_multilib_options "" - -# The default compiler for this target. -set_board_info compiler "$env(GDBTEST_CC)" -set_board_info cflags "$env(GDBTEST_CFLAGS)" -set_board_info assembler "$env(GDBTEST_AS) $env(GDBTEST_ASFLAGS)" -set_board_info linker "$env(GDBTEST_LD)" -set_board_info ldflags "$env(GDBTEST_LDFLAGS)" - -# We will be using the standard GDB remote protocol -set_board_info gdb_protocol "remote" - -set_board_info netport "$env(GDBTEST_GDBSERVER_HOST):$env(GDBTEST_GDBSERVER_PORT)" - -# Path to the gdbserver executable, if required. -set_board_info gdb_server_prog $env(GDBTEST_GDBSERVER_PATH) -# "../gdbserver/gdbserver" - -# Name of the computer whose socket will be used, if required. -set_board_info sockethost "$env(GDBTEST_GDBSERVER_HOST):" - -# Port ID to use for socket connection -set_board_info gdb,socketport $env(GDBTEST_GDBSERVER_PORT) - -# Use techniques appropriate to a stub -set_board_info use_gdb_stub 1 - -# This gdbserver can only run a process once per session. -set_board_info gdb,do_reload_on_run 1 - -# There's no support for argument-passing (yet). -set_board_info noargs 1 - -# Can't do FILE IO in current gdbserver -set_board_info gdb,nofileio 1 - -# Can't do input (or output) in the current gdbserver. -set_board_info gdb,noinferiorio 1 - -# Can't do hardware watchpoints, in general -set_board_info gdb,no_hardware_watchpoints 1 - -# Copy the testcases using cp -set_board_info rcp_prog "cp" - - -# Set nfs directory -# On my machine this is how it is mounted. - ramana -# kanika:/home/opt/share on /mnt/nfsmounts type nfs (rw,addr=192.168.100.68) -set_board_info nfsdir $env(GDBTEST_NFSDIR) - -# Set the test directory on the board. Where is this mounted -# on the board. -set_board_info tests_dir $env(GDBTEST_TESTS_DIR) - -# run on target using rsh -set_board_info rsh_prog "rsh" - -# Download directory -set_board_info download_dir $env(GDBTEST_DOWNLOAD_DIR) - -# Hostname -set_board_info hostname $env(GDBTEST_GDBSERVER_HOST) -set_board_info username "root" -set_board_info sockethost "$env(GDBTEST_GDBSERVER_HOST):" - -#Shell prompt -set_board_info shell_prompt "\[arcLinux\]$" - -#set_board_info board,connect "telnet" - -# timeout -#set_board_info gdb,timeout 300 diff --git a/gdb/testsuite/lib/arc-jtag.exp b/gdb/testsuite/lib/arc-jtag.exp deleted file mode 100644 index c613f307a79..00000000000 --- a/gdb/testsuite/lib/arc-jtag.exp +++ /dev/null @@ -1,32 +0,0 @@ -# -# The baseboard file for the arcjtag target -# - -load_generic_config "arc-jtag" - -set_board_info compiler "$env(GDBTEST_CC)" -set_board_info cflags "$env(GDBTEST_CFLAGS)" -set_board_info assembler "$env(GDBTEST_AS) $env(GDBTEST_ASFLAGS)" -set_board_info linker "$env(GDBTEST_LD)" -set_board_info ldflags "$env(GDBTEST_LDFLAGS)" - -#Reload the file before running -set_board_info gdb,do_reload_on_run 1 - -#Arguments cannot be passed -set_board_info noargs 1 - -#File IO not supported -set_board_info gdb,nofileio 1 - -#Inferior is unable to do I/O -set_board_info gdb,noinferiorio 1 - -#Signals not supported -set_board_info gdb,nosignals 1 - -#Skip the huge.exp test -set_board_info gdb,skip_huge_test 1 - -#We use "target arcjtag" to talk to JTAG -set_board_info gdb_protocol "arcjtag" diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index cbfa253579a..edf52e04698 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -191,7 +191,21 @@ proc delete_breakpoints {} { proc gdb_run_cmd {args} { global gdb_prompt - if [target_info exists gdb_init_command] { + + send_gdb "target sim\n" + gdb_expect 120 { + -re "Connected to the simulator.*$gdb_prompt $" { + verbose "Connected to simulator." 2 + } + } + + send_gdb "load\n" + gdb_expect 120 { + -re ".*$gdb_prompt $" { + } + } + + if [target_info exists gdb_init_command] { send_gdb "[target_info gdb_init_command]\n"; gdb_expect 30 { -re "$gdb_prompt $" { } diff --git a/gdb/testsuite/lib/gdbserver-support.exp b/gdb/testsuite/lib/gdbserver-support.exp index 73de76f0883..6fbaa224386 100644 --- a/gdb/testsuite/lib/gdbserver-support.exp +++ b/gdb/testsuite/lib/gdbserver-support.exp @@ -250,10 +250,6 @@ proc gdbserver_start { options arguments } { proc gdbserver_spawn { child_args } { set target_exec [gdbserver_download] - if [target_info exists tests_dir] { - set tests_dir [target_info tests_dir] - set gdbserver_server_exec $tests_dir/$gdbserver_server_exec - } # Fire off the debug agent. This flavour of gdbserver takes as # arguments the port information, the name of the executable file to # be debugged, and any arguments. diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp index a67b0cc8a8c..99cc80bc64c 100644 --- a/gdb/testsuite/lib/mi-support.exp +++ b/gdb/testsuite/lib/mi-support.exp @@ -773,6 +773,19 @@ proc mi_run_cmd {args} { } global mi_gdb_prompt + send_gdb "target sim\n" + gdb_expect 120 { + -re "Connected to the simulator.*$gdb_prompt $" { + verbose "Connected to simulator." 2 + } + } + + send_gdb "load\n" + gdb_expect 120 { + -re ".*$gdb_prompt $" { + } + } + if [target_info exists gdb_init_command] { send_gdb "[target_info gdb_init_command]\n"; gdb_expect 30 { diff --git a/gdb/testsuite/lib/telnet-exec.exp b/gdb/testsuite/lib/telnet-exec.exp deleted file mode 100644 index 8bbaa8de232..00000000000 --- a/gdb/testsuite/lib/telnet-exec.exp +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/expect -f - -# -# -# - - -set host "192.168.100.222" -set debuggee [lindex $argv 0] - -set timeout 360 -set env(TERM) vt100; # actual value doesn't matter, just has to be set - -spawn telnet $host -sleep 1; # wait for telnet to happen -send "PS1=\\# \r" -expect "\# " -#expect "\[arcLinux\]\$" -#send_user "one\n" - - -send "cd /nfs/gdbserver-tests/ \r" -expect "\# " -#expect "\[arcLinux\]\$" -send_user "starting gdbserver...\n" -send "./gdbserver host:4004 /nfs/gdbserver-tests/ramana-tests/a-4004.out \r" - -expect "xxx" -send "exit"
\ No newline at end of file |