From b4ca5ed946e024ae1b311c59d83793eba0a8214b Mon Sep 17 00:00:00 2001 From: Yit Phang Khoo Date: Sat, 8 Sep 2012 05:29:21 +0000 Subject: [PATCH] 2012-09-08 Khoo Yit Phang Replace -nw option with $INTERNAL_GDBFLAGS in "xgdb" tests to avoid spurious results due to ~/.gdbinit. * gdb.gdb/complaint.exp (setup_test): Replace -nw option with $INTERNAL_GDBFLAGS in run command. * gdb.gdb/observer.exp (setup_test): Ditto. * gdb.gdb/selftest.exp (test_with_self): Ditto. * gdb.gdb/xfullpath.exp (setup_test): Ditto. --- gdb/testsuite/ChangeLog | 10 ++++++++++ gdb/testsuite/gdb.gdb/complaints.exp | 3 ++- gdb/testsuite/gdb.gdb/observer.exp | 3 ++- gdb/testsuite/gdb.gdb/selftest.exp | 3 ++- gdb/testsuite/gdb.gdb/xfullpath.exp | 3 ++- 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index bea1678..842fc15 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,13 @@ +2012-09-08 Khoo Yit Phang + + Replace -nw option with $INTERNAL_GDBFLAGS in "xgdb" tests to + avoid spurious results due to ~/.gdbinit. + * gdb.gdb/complaint.exp (setup_test): Replace -nw option with + $INTERNAL_GDBFLAGS in run command. + * gdb.gdb/observer.exp (setup_test): Ditto. + * gdb.gdb/selftest.exp (test_with_self): Ditto. + * gdb.gdb/xfullpath.exp (setup_test): Ditto. + 2012-09-06 Doug Evans * boards/fission.exp: New file. diff --git a/gdb/testsuite/gdb.gdb/complaints.exp b/gdb/testsuite/gdb.gdb/complaints.exp index 97a3270..fd651a5 100644 --- a/gdb/testsuite/gdb.gdb/complaints.exp +++ b/gdb/testsuite/gdb.gdb/complaints.exp @@ -31,6 +31,7 @@ if [target_info exists gdb,noinferiorio] { proc setup_test { executable } { global gdb_prompt global timeout + global INTERNAL_GDBFLAGS # load yourself into the debugger # This can take a relatively long time, particularly for testing where @@ -73,7 +74,7 @@ proc setup_test { executable } { set timeout 600 set description "run until breakpoint at captured_command_loop" - gdb_test_multiple "run -nw" "$description" { + gdb_test_multiple "run $INTERNAL_GDBFLAGS" "$description" { -re "Starting program.*Breakpoint \[0-9\]+,.*captured_command_loop .data.* at .*main.c:.*$gdb_prompt $" { pass "$description" } diff --git a/gdb/testsuite/gdb.gdb/observer.exp b/gdb/testsuite/gdb.gdb/observer.exp index 47a4a11..93c08a4 100644 --- a/gdb/testsuite/gdb.gdb/observer.exp +++ b/gdb/testsuite/gdb.gdb/observer.exp @@ -25,6 +25,7 @@ if { [is_remote target] || ![isnative] } then { proc setup_test { executable } { global gdb_prompt global timeout + global INTERNAL_GDBFLAGS # load yourself into the debugger # This can take a relatively long time, particularly for testing where @@ -67,7 +68,7 @@ proc setup_test { executable } { set timeout 600 set description "run until breakpoint at captured_main" - gdb_test_multiple "run -nw" "$description" { + gdb_test_multiple "run $INTERNAL_GDBFLAGS" "$description" { -re "Starting program.*Breakpoint \[0-9\]+,.*captured_main .data.* at .*main.c:.*$gdb_prompt $" { pass "$description" } diff --git a/gdb/testsuite/gdb.gdb/selftest.exp b/gdb/testsuite/gdb.gdb/selftest.exp index 7645caf..e2e327f 100644 --- a/gdb/testsuite/gdb.gdb/selftest.exp +++ b/gdb/testsuite/gdb.gdb/selftest.exp @@ -242,6 +242,7 @@ proc test_with_self { executable } { global det_file global decimal global timeout + global INTERNAL_GDBFLAGS # load yourself into the debugger # This can take a relatively long time, particularly for testing where @@ -303,7 +304,7 @@ proc test_with_self { executable } { set timeout 600 set description "run until breakpoint at captured_main" - gdb_test_multiple "run -nw" "$description" { + gdb_test_multiple "run $INTERNAL_GDBFLAGS" "$description" { -re "Starting program.*Breakpoint \[0-9\]+,.*captured_main .data.* at .*main.c:.*$gdb_prompt $" { pass "$description" } diff --git a/gdb/testsuite/gdb.gdb/xfullpath.exp b/gdb/testsuite/gdb.gdb/xfullpath.exp index 0ebf824..98b1ae9 100644 --- a/gdb/testsuite/gdb.gdb/xfullpath.exp +++ b/gdb/testsuite/gdb.gdb/xfullpath.exp @@ -25,6 +25,7 @@ if { [is_remote target] || ![isnative] } then { proc setup_test { executable } { global gdb_prompt global timeout + global INTERNAL_GDBFLAGS # load yourself into the debugger # This can take a relatively long time, particularly for testing where @@ -67,7 +68,7 @@ proc setup_test { executable } { set timeout 600 set description "run until breakpoint at captured_main" - gdb_test_multiple "run -nw" "$description" { + gdb_test_multiple "run $INTERNAL_GDBFLAGS" "$description" { -re "Starting program.*Breakpoint \[0-9\]+,.*captured_main .data.* at .*main.c:.*$gdb_prompt $" { pass "$description" } -- 2.7.4