OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove support for testing against dead "target vxworks" 

"target vxworks" and friends have been removed 10 years ago already:

 commit e84ecc995d
 Author:     Andrew Cagney <cagney@redhat.com>
 AuthorDate: Sat Nov 13 23:10:02 2004 +0000

    2004-11-13  Andrew Cagney  <cagney@gnu.org>

        * configure.tgt: Delete i[34567]86-*-vxworks*, m68*-netx-*,
        m68*-*-vxworks*, mips*-*-vxworks*, powerpc-*-vxworks*, and
        sparc-*-vxworks*.
        * NEWS: Mention that vxworks was deleted.
	(...)
        * remote-vxmips.c, remote-vx.c: Delete.
        * remote-vx68.c: Delete.
	(...)

This removes related leftover cruft from the testsuite.

Tested on x86_64 Fedora 20, native and gdbserver.

gdb/testsuite/
2014-09-16  Pedro Alves  <palves@redhat.com>

	* config/vx.exp, config/vxworks.exp, config/vxworks29k.exp: Delete
	files.
	* gdb.base/a2-run.exp: Remove all code guarded by istarget
	"*-*-vxworks*" throughout.
	* gdb.base/break.exp: Likewise.
	* gdb.base/default.exp: Likewise.
	* gdb.base/scope.exp: Likewise.
	* gdb.base/sepdebug.exp: Likewise.
	* gdb.base/break.c: Remove all code guarded by #ifdef vxworks
	throughout.
	* gdb.base/run.c: Likewise.
	* gdb.base/sepdebug.c: Likewise.
	* gdb.hp/gdb.aCC/run.c: Likewise.
	* gdb.reverse/until-reverse.c: Likewise.
	* lib/gdb.exp (gdb_compile): Remove is_vxworks branch.
This commit is contained in:
Pedro Alves 2014-09-16 12:37:03 +01:00
parent 666d413cc3
commit 428b16bd5a
15 changed files with 54 additions and 492 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,21 @@
2014-09-16 Pedro Alves <palves@redhat.com>
* config/vx.exp, config/vxworks.exp, config/vxworks29k.exp: Delete
files.
* gdb.base/a2-run.exp: Remove all code guarded by istarget
"*-*-vxworks*" throughout.
* gdb.base/break.exp: Likewise.
* gdb.base/default.exp: Likewise.
* gdb.base/scope.exp: Likewise.
* gdb.base/sepdebug.exp: Likewise.
* gdb.base/break.c: Remove all code guarded by #ifdef vxworks
throughout.
* gdb.base/run.c: Likewise.
* gdb.base/sepdebug.c: Likewise.
* gdb.hp/gdb.aCC/run.c: Likewise.
* gdb.reverse/until-reverse.c: Likewise.
* lib/gdb.exp (gdb_compile): Remove is_vxworks branch.
2014-09-16 Yao Qi <yao@codesourcery.com>
* boards/local-remote-host-native.exp: New file.

126
gdb/testsuite/config/vx.exp
View File

@ -1,126 +0,0 @@
# Copyright 1988-2014 Free Software Foundation, Inc.
# This program 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 3 of the License, or
# (at your option) any later version.
#
# This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
# This file was written by Rob Savoye. (rob@cygnus.com)
#
# load support libraries
#
load_lib remote.exp
load_lib gdb.exp
set shell_prompt "->"
set gdb_prompt "\\(vxgdb\\)"
#
# gdb_version -- extract and print the version number of gcc
#
proc gdb_version {} {
default_gdb_version
}
#
# gdb_load -- load a file into the debugger.
# We have to stop and start gdb each time we do this, because when
# vxgdb loads two files in a row, the symbols in the first file loaded
# take precedence. Returns -1 on error, else 0.
#
proc gdb_load { arg } {
set result 0
if { [remote_ld target $arg] != 0 } {
perror "Couldn't load $arg"
return -1
}
return [gdb_file_cmd $arg]
}
#
# gdb_start -- start gdb running
#
proc gdb_start { } {
global gdb_prompt
global verbose
global connectmode
global reboot
# get a connection to the board
for { set x 0 } { $x < 3 } { incr x } {
set shell_id [remote_open target]
if { $shell_id > 0 } {
verbose "Spawn id for remote shell is $shell_id"
set timeout 10
verbose "Timeout is now $timeout seconds" 2
set state [spawn_vxgdb]
if { $state == "pass" } {
return 0
}
if { $state == "fail" } {
return -1
}
}
remote_reboot target
}
}
proc spawn_vxgdb { } {
global gdb_prompt
default_gdb_start
# set the default arguments to "main", so that "run" with no
# arguments will work correctly.
send_gdb "set args main\n"
gdb_expect -re ".*$gdb_prompt $" {}
verbose "Setting up target, Please wait..."
# set targets hostname
send_gdb "target vxworks [target_info hostname]\n"
set timeout 60
verbose "Timeout is now $timeout seconds" 2
gdb_expect {
-re "Done\..*$gdb_prompt $" {
verbose "Set target to [target_info hostname]" 1
set timeout 10
return "pass"
}
-re "net_connect: RPC: (Program not registered|.*Timed out).*$" {
warning "Couldn't set GDB to target [target_info netport]."
}
timeout {
warning "Couldn't set target for vxworks."
}
}
return "retry"
}
proc gdb_exit { } {
remote_close target
catch default_gdb_exit
}
#expect_after {
# "<return>" { send "\n"; perror "Window too small." }
# -re "\(y or n\) " { send "n\n"; perror "Got interactive prompt." }
# buffer_full { perror "internal buffer is full." }
# eof { perror "eof -- pty is hosed." }
# timeout { perror "timeout." }
# "virtual memory exhausted" { perror "virtual memory exhausted." }
# "Undefined command" { perror "send string probably wrong." }
#}

16
gdb/testsuite/config/vxworks.exp
View File

@ -1,16 +0,0 @@
# Copyright 1997-2014 Free Software Foundation, Inc.
# This program 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 3 of the License, or
# (at your option) any later version.
#
# This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
load_lib ../config/vx.exp

23
gdb/testsuite/config/vxworks29k.exp
View File

@ -1,23 +0,0 @@
# Copyright 1995-2014 Free Software Foundation, Inc.
# This program 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 3 of the License, or
# (at your option) any later version.
#
# This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
# This file was written by Brendan Kehoe (brendan@cygnus.com).
# We need this file here because the targetname for the 29k board
# is `vxworks29k', not `vxworks'. That way other tools (e.g., gcc)
# can differentiate between the stuff run on that board and others.
verbose "Loading ${srcdir}/config/vx.exp"
source ${srcdir}/config/vx.exp

144
gdb/testsuite/gdb.base/a2-run.exp
View File

@ -31,31 +31,26 @@ if { [prepare_for_testing ${testfile}.exp $testfile $srcfile] } {
}
# Run with no arguments.
# On VxWorks this justs make sure the program was run.
gdb_run_cmd
set test "run \"$testfile\" with no args"
if [istarget "*-*-vxworks*"] then {
gdb_test "" "usage: factorial <number>.*" $test
} else {
gdb_test_multiple "" $test {
-re ".*usage: factorial <number>.*$inferior_exited_re with code 01.\r\n$gdb_prompt $" {
pass $test
pass "no spurious messages at program exit"
}
-re ".*usage: factorial <number>.*$inferior_exited_re with code 01.*$gdb_prompt $" {
pass $test
fail "no spurious messages at program exit"
}
-re ".*usage: factorial <number>.* EXIT code 1.*$inferior_exited_re normally.\r\n$gdb_prompt $" {
pass "$test (exit wrapper)"
pass "no spurious messages at program exit"
}
-re ".*usage: factorial <number>.* EXIT code 1.*$inferior_exited_re normally.*$gdb_prompt $" {
pass "$test (exit wrapper)"
fail "no spurious messages at program exit"
}
gdb_test_multiple "" $test {
-re ".*usage: factorial <number>.*$inferior_exited_re with code 01.\r\n$gdb_prompt $" {
pass $test
pass "no spurious messages at program exit"
}
-re ".*usage: factorial <number>.*$inferior_exited_re with code 01.*$gdb_prompt $" {
pass $test
fail "no spurious messages at program exit"
}
-re ".*usage: factorial <number>.* EXIT code 1.*$inferior_exited_re normally.\r\n$gdb_prompt $" {
pass "$test (exit wrapper)"
pass "no spurious messages at program exit"
}
-re ".*usage: factorial <number>.* EXIT code 1.*$inferior_exited_re normally.*$gdb_prompt $" {
pass "$test (exit wrapper)"
fail "no spurious messages at program exit"
}
}
@ -67,112 +62,30 @@ if [target_info exists noargs] then {
}
# Now run with some arguments
if [istarget "*-*-vxworks*"] then {
send_gdb "run vxmain \"5\"\n"
gdb_expect -re "run vxmain \"5\"\r\n" {}
set timeout 120
verbose "Timeout is now $timeout seconds" 2
gdb_expect {
"$inferior_exited_re normally" {
unresolved "run \"$testfile\" with arg"
}
"120" {
pass "run \"$testfile\" with arg"
}
timeout {
fail "(timeout) run \"$testfile\" with arg"
}
}
set timeout 10
verbose "Timeout is now $timeout seconds" 2
gdb_expect -re "$gdb_prompt $" {}
} else {
setup_xfail "arm-*-coff"
gdb_run_cmd 5
gdb_test "" "120.*" "run \"$testfile\" with arg"
}
setup_xfail "arm-*-coff"
gdb_run_cmd 5
gdb_test "" "120.*" "run \"$testfile\" with arg"
# Run again with same arguments.
gdb_run_cmd
if [istarget "*-*-vxworks*"] then {
set timeout 120
verbose "Timeout is now $timeout seconds" 2
gdb_expect {
"$inferior_exited_re normally" {
unresolved "run \"$testfile\" again with same args"
}
"120" { pass "run \"$testfile\" again with same args" }
timeout { fail "(timeout) run \"$testfile\" again with same args" }
}
set timeout 10
verbose "Timeout is now $timeout seconds" 2
gdb_expect -re "$gdb_prompt $" {}
} else {
setup_xfail "arm-*-coff"
gdb_test "" "120.*" "run \"$testfile\" again with same args"
}
setup_xfail "arm-*-coff"
gdb_test "" "120.*" "run \"$testfile\" again with same args"
# Use "set args" command to specify no arguments as default and run again.
if [istarget "*-*-vxworks*"] then {
gdb_test_no_output "set args main"
} else {
gdb_test_no_output "set args"
}
gdb_test_no_output "set args"
gdb_run_cmd
if [istarget "*-*-vxworks*"] then {
set timeout 120
verbose "Timeout is now $timeout seconds" 2
gdb_expect {
"$inferior_exited_re normally" {
unresolved "run after setting args to nil"
}
"usage: factorial <number>" {
pass "run after setting args to nil"
}
timeout {
fail "(timeout) run after setting args to nil"
}
}
set timeout 10
verbose "Timeout is now $timeout seconds" 2
gdb_expect -re "$gdb_prompt $" {}
} else {
gdb_test "" "usage: factorial <number>.*" "run after setting args to nil"
}
gdb_test "" "usage: factorial <number>.*" "run after setting args to nil"
# Use "set args" command to specify an argument and run again.
if [istarget "*-*-vxworks*"] then {
gdb_test_no_output "set args vxmain \"6\""
} else {
gdb_test_no_output "set args 6"
}
gdb_test_no_output "set args 6"
gdb_run_cmd
if [istarget "*-*-vxworks*"] then {
set timeout 120
verbose "Timeout is now $timeout seconds" 2
gdb_expect {
"$inferior_exited_re normally" {
unresolved "run \"$testfile\" again after setting args"
}
"720" {
pass "run \"$testfile\" again after setting args"
}
timeout {
fail "(timeout) run \"$testfile\" again after setting args"
}
}
set timeout 10
verbose "Timeout is now $timeout seconds" 2
gdb_expect -re "$gdb_prompt $" {}
} else {
setup_xfail "arm-*-coff"
gdb_test "" "720.*" "run \"$testfile\" again after setting args"
}
setup_xfail "arm-*-coff"
gdb_test "" "720.*" "run \"$testfile\" again after setting args"
# GOAL: Test that shell is being used with "run". For remote debugging
# targets, there is no guarantee that a "shell" (whatever that is) is used.
@ -181,8 +94,3 @@ if ![is_remote target] then {
"Starting program.*40320.*" \
"run \"$testfile\" with shell"
}
# Reset the default arguments for VxWorks
if [istarget "*-*-vxworks*"] then {
gdb_test_no_output "set args main"
}

35
gdb/testsuite/gdb.base/break.c
View File

@ -15,39 +15,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#ifdef vxworks
# include <stdio.h>
/* VxWorks does not supply atoi. */
static int
atoi (z)
char *z;
{
int i = 0;
while (*z >= '0' && *z <= '9')
i = i * 10 + (*z++ - '0');
return i;
}
/* I don't know of any way to pass an array to VxWorks. This function
can be called directly from gdb. */
vxmain (arg)
char *arg;
{
char *argv[2];
argv[0] = "";
argv[1] = arg;
main (2, argv, (char **) 0);
}
#else /* ! vxworks */
# include <stdio.h>
# include <stdlib.h>
#endif /* ! vxworks */
#include <stdio.h>
#include <stdlib.h>
#ifdef PROTOTYPES
extern int marker1 (void);

7
gdb/testsuite/gdb.base/break.exp
View File

@ -949,10 +949,3 @@ gdb_test_no_output "set \$foo=81.5" \
gdb_test "break $srcfile:\$foo" \
"Convenience variables used in line specs must have integer values.*" \
"set breakpoint via non-integer convenience variable disallowed"
# Reset the default arguments for VxWorks
if [istarget "*-*-vxworks*"] {
set timeout 10
verbose "Timeout is now $timeout seconds" 2
gdb_test_no_output "set args main"
}

15
gdb/testsuite/gdb.base/default.exp
View File

@ -412,14 +412,6 @@ gdb_test "pwd" "Working directory .*" "pwd"
#test run "r" abbreviation
if $use_gdb_stub {
# Only extended-remote supports "run".
} elseif [istarget "*-*-vxworks*"] then {
gdb_test "set args" ".*" ""
gdb_test "r" "Starting program: .*
You must specify a function name to run, and arguments if any"\
"run \"r\" abbreviation"
gdb_test "set args main" ".*" ""
} else {
gdb_test_multiple "r" "run \"r\" abbreviation" {
-re "Starting program: .*You can't do that when your target is `None'.*$gdb_prompt $"\
@ -442,13 +434,6 @@ You must specify a function name to run, and arguments if any"\
#test run
if $use_gdb_stub {
# Only extended-remote supports "run".
} elseif [istarget "*-*-vxworks*"] then {
gdb_test "set args" ".*" ""
gdb_test "run" "Starting program: .*
You must specify a function name to run, and arguments if any"
gdb_test "set args main" ".*" ""
} else {
gdb_test_multiple "run" "run" {
-re "Starting program:.*You can't do that when your target is `None'.*$gdb_prompt $"\

35
gdb/testsuite/gdb.base/run.c
View File

@ -3,39 +3,8 @@
* testing stack backtraces and such.
*/
#ifdef vxworks
# include <stdio.h>
/* VxWorks does not supply atoi. */
static int
atoi (z)
char *z;
{
int i = 0;
while (*z >= '0' && *z <= '9')
i = i * 10 + (*z++ - '0');
return i;
}
/* I don't know of any way to pass an array to VxWorks. This function
can be called directly from gdb. */
vxmain (arg)
char *arg;
{
char *argv[2];
argv[0] = "";
argv[1] = arg;
main (2, argv, (char **) 0);
}
#else /* ! vxworks */
# include <stdio.h>
# include <stdlib.h>
#endif /* ! vxworks */
#include <stdio.h>
#include <stdlib.h>
#ifdef PROTOTYPES
int factorial (int);

10
gdb/testsuite/gdb.base/scope.exp
View File

@ -499,11 +499,6 @@ proc test_at_localscopes {} {
gdb_stop_suppressing_tests
}
if [istarget "*-*-vxworks*"] {
set timeout 120
verbose "Timeout is now $timeout seconds" 2
}
# Test that variables in various segments print out correctly before
# the program is run.
@ -536,8 +531,3 @@ if [runto foo] then { test_at_foo }
if [runto bar] then { test_at_bar }
if [runto localscopes] then { test_at_localscopes }
if [runto autovars] then { test_at_autovars }
if [istarget "*-*-vxworks*"] {
set timeout 120
verbose "Timeout is now $timeout seconds" 2
}

35
gdb/testsuite/gdb.base/sepdebug.c
View File

@ -13,39 +13,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#ifdef vxworks
# include <stdio.h>
/* VxWorks does not supply atoi. */
static int
atoi (z)
char *z;
{
int i = 0;
while (*z >= '0' && *z <= '9')
i = i * 10 + (*z++ - '0');
return i;
}
/* I don't know of any way to pass an array to VxWorks. This function
can be called directly from gdb. */
vxmain (arg)
char *arg;
{
char *argv[2];
argv[0] = "";
argv[1] = arg;
main (2, argv, (char **) 0);
}
#else /* ! vxworks */
# include <stdio.h>
# include <stdlib.h>
#endif /* ! vxworks */
#include <stdio.h>
#include <stdlib.h>
/*
* The following functions do nothing useful. They are included simply

8
gdb/testsuite/gdb.base/sepdebug.exp
View File

@ -713,14 +713,6 @@ proc test_different_dir {type test_different_dir xfail} {
}
}
# Reset the default arguments for VxWorks
if [istarget "*-*-vxworks*"] {
set timeout 10
verbose "Timeout is now $timeout seconds" 2
gdb_test_no_output "set args main"
}
# proc test_different_dir
}
}

35
gdb/testsuite/gdb.hp/gdb.aCC/run.c
View File

@ -3,39 +3,8 @@
* testing stack backtraces and such.
*/
#ifdef vxworks
# include <stdio.h>
/* VxWorks does not supply atoi. */
static int
atoi (char *z)
/* char *z;*/
{
int i = 0;
while (*z >= '0' && *z <= '9')
i = i * 10 + (*z++ - '0');
return i;
}
/* I don't know of any way to pass an array to VxWorks. This function
can be called directly from gdb. */
void vxmain (char *arg)
/*char *arg;*/
{
char *argv[2];
argv[0] = "";
argv[1] = arg;
main (2, argv, (char **) 0);
}
#else /* ! vxworks */
# include <stdio.h>
# include <stdlib.h>
#endif /* ! vxworks */
#include <stdio.h>
#include <stdlib.h>
int main (int argc, char *argv[], char **envp)
/*int argc;

35
gdb/testsuite/gdb.reverse/until-reverse.c
View File

@ -15,39 +15,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#ifdef vxworks
# include <stdio.h>
/* VxWorks does not supply atoi. */
static int
atoi (z)
char *z;
{
int i = 0;
while (*z >= '0' && *z <= '9')
i = i * 10 + (*z++ - '0');
return i;
}
/* I don't know of any way to pass an array to VxWorks. This function
can be called directly from gdb. */
vxmain (arg)
char *arg;
{
char *argv[2];
argv[0] = "";
argv[1] = arg;
main (2, argv, (char **) 0);
}
#else /* ! vxworks */
# include <stdio.h>
# include <stdlib.h>
#endif /* ! vxworks */
#include <stdio.h>
#include <stdlib.h>
#ifdef PROTOTYPES
extern int marker1 (void);

4
gdb/testsuite/lib/gdb.exp
View File

@ -2809,10 +2809,6 @@ proc gdb_compile {source dest type options} {
}
set options $new_options
if [target_info exists is_vxworks] {
set options2 { "additional_flags=-Dvxworks" }
set options [concat $options2 $options]
}
if [info exists GDB_TESTCASE_OPTIONS] {
lappend options "additional_flags=$GDB_TESTCASE_OPTIONS"
}