diff options
Diffstat (limited to 'gdb/testsuite')
| -rw-r--r-- | gdb/testsuite/ChangeLog | 20 | ||||
| -rw-r--r-- | gdb/testsuite/Makefile.in | 2 | ||||
| -rw-r--r-- | gdb/testsuite/config/monitor.exp | 2 | ||||
| -rwxr-xr-x | gdb/testsuite/configure | 3 | ||||
| -rw-r--r-- | gdb/testsuite/configure.ac | 3 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/attach.exp | 12 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/checkpoint.exp | 7 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/default.exp | 6 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.gdb/selftest.exp | 12 | ||||
| -rw-r--r-- | gdb/testsuite/lib/gdb.exp | 6 |
10 files changed, 53 insertions, 20 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index a737872..947e5fe 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,23 @@ +2008-11-20 Stan Shebs <stan@codesourcery.com> + + 2008-09-14 Stan Shebs <stan@codesourcery.com> + + * gdb.gdb/selftest.exp: Update to reflect current sources. + * Makefile.in (ALL_SUBDIRS): Add gdb.multi. + * configure.ac (AC_OUTPUT): Add gdb.multi/Makefile. + * configure: Regenerate. + + * gdb.multi/Makefile.in: New. + * gdb.multi/hello.c, hangout.c, goodbye.c: New source files. + * gdb.multi/base.exp: New file, basic multiprocess tests. + + 2008-08-25 Stan Shebs <stan@codesourcery.com> + + * config/monitor.exp: Match on rephrased message. + * gdb.base/attach.exp: Ditto. + * gdb.base/default.exp: Ditto. + * lib/gdb.exp: Ditto. + 2008-11-18 Thiago Jung Bauermann <bauerman@br.ibm.com> * gdb.arch/ppc-dfp.exp: New file. diff --git a/gdb/testsuite/Makefile.in b/gdb/testsuite/Makefile.in index 11fc26e..a3d683f 100644 --- a/gdb/testsuite/Makefile.in +++ b/gdb/testsuite/Makefile.in @@ -35,7 +35,7 @@ SUBDIRS = @subdirs@ RPATH_ENVVAR = @RPATH_ENVVAR@ ALL_SUBDIRS = gdb.ada gdb.arch gdb.asm gdb.base gdb.cp gdb.disasm \ gdb.dwarf2 \ - gdb.fortran gdb.server gdb.java gdb.mi \ + gdb.fortran gdb.server gdb.java gdb.mi gdb.multi \ gdb.objc gdb.opt gdb.pascal gdb.python gdb.threads gdb.trace \ gdb.xml \ $(SUBDIRS) diff --git a/gdb/testsuite/config/monitor.exp b/gdb/testsuite/config/monitor.exp index 4e13b0c..60257be 100644 --- a/gdb/testsuite/config/monitor.exp +++ b/gdb/testsuite/config/monitor.exp @@ -123,7 +123,7 @@ proc gdb_target_monitor { exec_file } { } proc gdb_target_exec { } { - gdb_test "target exec" "No executable file now." "" ".*Kill it.*y or n.*" "y" + gdb_test "target exec" "No executable files now." "" ".*Kill it.*y or n.*" "y" } # diff --git a/gdb/testsuite/configure b/gdb/testsuite/configure index ef35b13..3350eb4 100755 --- a/gdb/testsuite/configure +++ b/gdb/testsuite/configure @@ -3131,7 +3131,7 @@ done - ac_config_files="$ac_config_files Makefile gdb.ada/Makefile gdb.arch/Makefile gdb.asm/Makefile gdb.base/Makefile gdb.cp/Makefile gdb.disasm/Makefile gdb.dwarf2/Makefile gdb.fortran/Makefile gdb.server/Makefile gdb.java/Makefile gdb.mi/Makefile gdb.modula2/Makefile gdb.objc/Makefile gdb.opt/Makefile gdb.pascal/Makefile gdb.python/Makefile gdb.threads/Makefile gdb.trace/Makefile gdb.xml/Makefile" + ac_config_files="$ac_config_files Makefile gdb.ada/Makefile gdb.arch/Makefile gdb.asm/Makefile gdb.base/Makefile gdb.cp/Makefile gdb.disasm/Makefile gdb.dwarf2/Makefile gdb.fortran/Makefile gdb.server/Makefile gdb.java/Makefile gdb.mi/Makefile gdb.multi/Makefile gdb.modula2/Makefile gdb.objc/Makefile gdb.opt/Makefile gdb.pascal/Makefile gdb.python/Makefile gdb.threads/Makefile gdb.trace/Makefile gdb.xml/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -3694,6 +3694,7 @@ do "gdb.server/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.server/Makefile" ;; "gdb.java/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.java/Makefile" ;; "gdb.mi/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.mi/Makefile" ;; + "gdb.multi/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.multi/Makefile" ;; "gdb.modula2/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.modula2/Makefile" ;; "gdb.objc/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.objc/Makefile" ;; "gdb.opt/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.opt/Makefile" ;; diff --git a/gdb/testsuite/configure.ac b/gdb/testsuite/configure.ac index 3d8fae4..a9065f1 100644 --- a/gdb/testsuite/configure.ac +++ b/gdb/testsuite/configure.ac @@ -115,7 +115,8 @@ AC_OUTPUT([Makefile \ gdb.arch/Makefile gdb.asm/Makefile gdb.base/Makefile \ gdb.cp/Makefile gdb.disasm/Makefile gdb.dwarf2/Makefile \ gdb.fortran/Makefile gdb.server/Makefile \ - gdb.java/Makefile gdb.mi/Makefile gdb.modula2/Makefile \ + gdb.java/Makefile gdb.mi/Makefile gdb.multi/Makefile \ + gdb.modula2/Makefile \ gdb.objc/Makefile gdb.opt/Makefile gdb.pascal/Makefile \ gdb.python/Makefile \ gdb.threads/Makefile gdb.trace/Makefile gdb.xml/Makefile]) diff --git a/gdb/testsuite/gdb.base/attach.exp b/gdb/testsuite/gdb.base/attach.exp index 4529715..b4c290e 100644 --- a/gdb/testsuite/gdb.base/attach.exp +++ b/gdb/testsuite/gdb.base/attach.exp @@ -205,8 +205,8 @@ proc do_attach_tests {} { set timeout 15 set test "attach1, purging symbols after detach" gdb_test_multiple "file" "$test" { - -re "No executable file now.*Discard symbol table.*y or n. $" { - gdb_test "y" "No symbol file now." "$test" + -re "No executable files now.*Discard all symbol tables.*y or n. $" { + gdb_test "y" "No symbol files now." "$test" } } set timeout $old_timeout @@ -297,16 +297,16 @@ proc do_attach_tests {} { set test "before attach3, flush symbols" gdb_test_multiple "symbol" "$test" { - -re "Discard symbol table from.*y or n. $" { - gdb_test "y" "No symbol file now." \ + -re "Discard all symbol tables.*y or n. $" { + gdb_test "y" "No symbol files now." \ "$test" } - -re "No symbol file now.*$gdb_prompt $" { + -re "No symbol files now.*$gdb_prompt $" { pass "$test" } } - gdb_test "exec" "No executable file now." \ + gdb_test "exec" "No executable files now." \ "before attach3, flush exec" gdb_test "attach $testpid" \ diff --git a/gdb/testsuite/gdb.base/checkpoint.exp b/gdb/testsuite/gdb.base/checkpoint.exp index c041e13..944e66e 100644 --- a/gdb/testsuite/gdb.base/checkpoint.exp +++ b/gdb/testsuite/gdb.base/checkpoint.exp @@ -46,6 +46,9 @@ gdb_exit gdb_start gdb_reinitialize_dir $srcdir/$subdir gdb_load ${binfile} +set prev_timeout $timeout +set timeout 600 +verbose "Timeout now 600 sec.\n" global gdb_prompt @@ -383,3 +386,7 @@ gdb_test "kill" "" "kill all one" \ # remote_exec build "rm -f pi.txt" + +# Restore old timeout +set timeout $prev_timeout +verbose "Timeout now $timeout sec.\n" diff --git a/gdb/testsuite/gdb.base/default.exp b/gdb/testsuite/gdb.base/default.exp index 5cae742..3d18a29 100644 --- a/gdb/testsuite/gdb.base/default.exp +++ b/gdb/testsuite/gdb.base/default.exp @@ -209,7 +209,7 @@ gdb_test "enable" "" "enable" #test exec-file send_gdb "exec-file\n" gdb_expect { - -re "No executable file now..*$gdb_prompt $" { + -re "No executable files now..*$gdb_prompt $" { pass "exec-file" } -re "exec-file.*A program is being debugged already. Kill it. .y or n.*$" { @@ -234,7 +234,7 @@ gdb_test "fg" "The program is not being run." "fg" #test file send_gdb "file\n" gdb_expect { - -re "No executable file now..*$gdb_prompt $"\ + -re "No executable files now..*$gdb_prompt $"\ { pass "file" } -re ".*A program is being debugged already. Kill it. .y or n.*$" { send_gdb "n\n" @@ -712,7 +712,7 @@ gdb_expect { #test target exec send_gdb "target exec\n" gdb_expect { - -re "No executable file now..*$gdb_prompt $"\ + -re "No executable files now..*$gdb_prompt $"\ { pass "target exec" } -re ".*A program is being debugged already. Kill it. .y or n.*$" { send_gdb "n\n" diff --git a/gdb/testsuite/gdb.gdb/selftest.exp b/gdb/testsuite/gdb.gdb/selftest.exp index 4abe21a..6ef7388 100644 --- a/gdb/testsuite/gdb.gdb/selftest.exp +++ b/gdb/testsuite/gdb.gdb/selftest.exp @@ -83,10 +83,6 @@ proc do_steps_and_nexts {} { set description "step over corearg initialization" set command "step" } - -re ".*pid_or_core_arg = NULL.*$gdb_prompt $" { - set description "step over pid_or_core_arg initialization" - set command "step" - } -re ".*cdarg = NULL.*$gdb_prompt $" { set description "step over cdarg initialization" set command "step" @@ -95,6 +91,14 @@ proc do_steps_and_nexts {} { set description "step over ttyarg initialization" set command "step" } + -re ".*miscargs = NULL.*$gdb_prompt $" { + set description "step over miscargs initialization" + set command "step" + } + -re ".*nmisc = 0.*$gdb_prompt $" { + set description "step over nmisc initialization" + set command "step" + } -re ".*time_at_startup = get_run_time.*$gdb_prompt $" { set description "next over get_run_time and everything it calls" set command "next" diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 72448cd..43ba08a 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -135,14 +135,14 @@ proc gdb_unload {} { global gdb_prompt send_gdb "file\n" gdb_expect 60 { - -re "No executable file now\[^\r\n\]*\[\r\n\]" { exp_continue } - -re "No symbol file now\[^\r\n\]*\[\r\n\]" { exp_continue } + -re "No executable files now\[^\r\n\]*\[\r\n\]" { exp_continue } + -re "No symbol files now\[^\r\n\]*\[\r\n\]" { exp_continue } -re "A program is being debugged already..*Kill it.*y or n. $"\ { send_gdb "y\n" verbose "\t\tKilling previous program being debugged" exp_continue } - -re "Discard symbol table from .*y or n.*$" { + -re "Discard all symbol tables.*y or n.*$" { send_gdb "y\n" exp_continue } |