diff options
author | Pedro Alves <palves@redhat.com> | 2012-02-21 22:01:10 +0000 |
---|---|---|
committer | Pedro Alves <palves@redhat.com> | 2012-02-21 22:01:10 +0000 |
commit | 0f4d39d53de83e8b4ecf0eb1fa85182074b04bc5 (patch) | |
tree | e5ae8263738b7f8b2bf7e3659203dad6bebbcce6 /gdb/testsuite/gdb.base | |
parent | f06e05e0a4b600e18ab3c0173d89cef745148b59 (diff) | |
download | fsf-binutils-gdb-0f4d39d53de83e8b4ecf0eb1fa85182074b04bc5.zip fsf-binutils-gdb-0f4d39d53de83e8b4ecf0eb1fa85182074b04bc5.tar.gz fsf-binutils-gdb-0f4d39d53de83e8b4ecf0eb1fa85182074b04bc5.tar.bz2 |
2012-02-21 Pedro Alves <palves@redhat.com>
* gdb.arch/altivec-abi.exp (altivec_abi_tests): Don't do
with_test_prefix here.
(top level): Do it here instead. Remove `:' from the
with_test_prefix string.
* gdb.base/attach-pie-misread.exp: Remove the leading space the
the suffix `:' from the with_test_prefix prefix string.
* gdb.base/break-interp.exp: Ditto.
* gdb.base/catch-load.exp: Ditto.
* gdb.base/disp-step-syscall.exp: Ditto.
* gdb.base/jit-so.exp: Ditto.
* gdb.base/jit.exp: Ditto.
* gdb.base/sepdebug.exp: Ditto.
* gdb.base/solib-display.exp: Ditto.
* gdb.base/solib-overlap.exp: Ditto.
* gdb.base/watch-cond-infcall.exp: Ditto.
* gdb.base/watchpoint.exp: Ditto.
* gdb.dwarf2/dw2-noloc.exp: Ditto.
* gdb.mi/mi-watch.exp: Ditto.
* gdb.mi/mi2-watch.exp: Ditto.
* gdb.threads/non-ldr-exc-1.exp: Ditto.
* gdb.threads/non-ldr-exc-2.exp: Ditto.
* gdb.threads/non-ldr-exc-3.exp: Ditto.
* gdb.threads/non-ldr-exc-4.exp: Ditto.
* gdb.threads/watchpoint-fork.exp: Ditto.
* gdb.threads/watchthreads-reorder.exp: Ditto.
* gdb.trace/change-loc.exp: Ditto.
* gdb.trace/pending.exp: Ditto.
* gdb.trace/status-stop.exp: Ditto.
* gdb.trace/strace.exp: Ditto.
* gdb.trace/trace-break.exp: Ditto.
* gdb.trace/unavailable.exp: Ditto.
* lib/gdb.exp (with_test_prefix): Always prefix with space and
suffix with colon. Adjust leading comments.
Diffstat (limited to 'gdb/testsuite/gdb.base')
-rw-r--r-- | gdb/testsuite/gdb.base/attach-pie-misread.exp | 2 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/break-interp.exp | 6 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/catch-load.exp | 2 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/disp-step-syscall.exp | 2 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/jit-so.exp | 2 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/jit.exp | 2 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/sepdebug.exp | 2 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/solib-display.exp | 2 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/solib-overlap.exp | 2 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/watch-cond-infcall.exp | 4 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/watchpoint.exp | 2 |
11 files changed, 14 insertions, 14 deletions
diff --git a/gdb/testsuite/gdb.base/attach-pie-misread.exp b/gdb/testsuite/gdb.base/attach-pie-misread.exp index de1055e..e7ff231 100644 --- a/gdb/testsuite/gdb.base/attach-pie-misread.exp +++ b/gdb/testsuite/gdb.base/attach-pie-misread.exp @@ -152,7 +152,7 @@ gdb_expect { } # Due to alignments it was reproducible with 1 on x86_64 but 2 on i686. -foreach align_mult {1 2} { with_test_prefix " shift-by-$align_mult:" { +foreach align_mult {1 2} { with_test_prefix "shift-by-$align_mult" { # FIXME: We believe there is enough room under FIRST_OFFSET. set shifted_offset [format 0x%x [expr "$first_offset - $align_mult * $align_max"]] diff --git a/gdb/testsuite/gdb.base/break-interp.exp b/gdb/testsuite/gdb.base/break-interp.exp index d6267ac..59e5753 100644 --- a/gdb/testsuite/gdb.base/break-interp.exp +++ b/gdb/testsuite/gdb.base/break-interp.exp @@ -185,12 +185,12 @@ proc reach_1 {func command displacement} { # displacement of 0 bytes to be present, "NONZERO" for displacement of non-0 # bytes to be present and "PRESENT" if both "ZERO" and "NONZERO" are valid. proc reach {func command displacement} { - with_test_prefix " reach-$func:" { + with_test_prefix "reach-$func" { reach_1 $func $command $displacement } } -proc test_core {file displacement} { with_test_prefix " core:" { +proc test_core {file displacement} { with_test_prefix "core" { global srcdir subdir gdb_prompt expect_out set corefile [core_find $file {} "segv"] @@ -239,7 +239,7 @@ proc test_core {file displacement} { with_test_prefix " core:" { gdb_test "bt" "#\[0-9\]+ +\[^\r\n\]*\\mlibfunc\\M\[^\r\n\]*\r\n#\[0-9\]+ +\[^\r\n\]*\\mmain\\M.*" "core main bt" }} -proc test_attach_gdb {file pid displacement prefix} { with_test_prefix " $prefix:" { +proc test_attach_gdb {file pid displacement prefix} { with_test_prefix "$prefix" { global gdb_prompt expect_out gdb_exit diff --git a/gdb/testsuite/gdb.base/catch-load.exp b/gdb/testsuite/gdb.base/catch-load.exp index e17a563..21b8505 100644 --- a/gdb/testsuite/gdb.base/catch-load.exp +++ b/gdb/testsuite/gdb.base/catch-load.exp @@ -46,7 +46,7 @@ if { [gdb_compile_shlib "${srcdir}/${subdir}/${srcfile2}" ${binfile2} {debug}] ! # names. # KIND is passed to the "catch" command. # MATCH is a boolean saying whether we expect the catchpoint to be hit. -proc one_catch_load_test {scenario kind match sostop} { with_test_prefix "${scenario}:" { +proc one_catch_load_test {scenario kind match sostop} { with_test_prefix "${scenario}" { global verbose testfile testfile2 binfile2_dlopen global srcfile global decimal gdb_prompt diff --git a/gdb/testsuite/gdb.base/disp-step-syscall.exp b/gdb/testsuite/gdb.base/disp-step-syscall.exp index 61de211..c62938c 100644 --- a/gdb/testsuite/gdb.base/disp-step-syscall.exp +++ b/gdb/testsuite/gdb.base/disp-step-syscall.exp @@ -30,7 +30,7 @@ if { [istarget "i\[34567\]86-*-linux*"] || [istarget "x86_64-*-linux*"] } { return -1 } -proc disp_step_cross_syscall { syscall } { with_test_prefix " $syscall:" { +proc disp_step_cross_syscall { syscall } { with_test_prefix "$syscall" { global syscall_insn global gdb_prompt diff --git a/gdb/testsuite/gdb.base/jit-so.exp b/gdb/testsuite/gdb.base/jit-so.exp index b595774..7df2011 100644 --- a/gdb/testsuite/gdb.base/jit-so.exp +++ b/gdb/testsuite/gdb.base/jit-so.exp @@ -63,7 +63,7 @@ if { [gdb_compile_shlib ${solib_srcfile} ${solib_binfile} {}] != "" } { set solib_binfile_target [gdb_download ${solib_binfile}] -proc one_jit_test {count match_str} { with_test_prefix " one_jit_test-$count:" { +proc one_jit_test {count match_str} { with_test_prefix "one_jit_test-$count" { global verbose testfile srcfile2 binfile2 binfile2_dlopen solib_binfile_target solib_binfile_test_msg clean_restart $testfile diff --git a/gdb/testsuite/gdb.base/jit.exp b/gdb/testsuite/gdb.base/jit.exp index 4b8059f..70b33a7 100644 --- a/gdb/testsuite/gdb.base/jit.exp +++ b/gdb/testsuite/gdb.base/jit.exp @@ -51,7 +51,7 @@ if { [gdb_compile_shlib ${solib_srcfile} ${solib_binfile} {-fPIC}] != "" } { set solib_binfile_target [gdb_download ${solib_binfile}] -proc one_jit_test {count match_str} { with_test_prefix " one_jit_test-$count:" { +proc one_jit_test {count match_str} { with_test_prefix "one_jit_test-$count" { global verbose testfile solib_binfile_target solib_binfile_test_msg clean_restart $testfile diff --git a/gdb/testsuite/gdb.base/sepdebug.exp b/gdb/testsuite/gdb.base/sepdebug.exp index cb1bd00..30ed7af 100644 --- a/gdb/testsuite/gdb.base/sepdebug.exp +++ b/gdb/testsuite/gdb.base/sepdebug.exp @@ -650,7 +650,7 @@ test_next_with_recursion #******** -proc test_different_dir {type test_different_dir xfail} { with_test_prefix " $type:" { +proc test_different_dir {type test_different_dir xfail} { with_test_prefix "$type" { global srcdir subdir objdir binfile srcfile timeout gdb_prompt global bp_location6 decimal hex diff --git a/gdb/testsuite/gdb.base/solib-display.exp b/gdb/testsuite/gdb.base/solib-display.exp index 6886e04..1491459 100644 --- a/gdb/testsuite/gdb.base/solib-display.exp +++ b/gdb/testsuite/gdb.base/solib-display.exp @@ -49,7 +49,7 @@ if [get_compiler_info ${binfile}] { } # SEP must be last for the possible `unsupported' error path. -foreach libsepdebug {NO IN SEP} { with_test_prefix " $libsepdebug:" { +foreach libsepdebug {NO IN SEP} { with_test_prefix "$libsepdebug" { set sep_lib_flags $lib_flags if {$libsepdebug != "NO"} { diff --git a/gdb/testsuite/gdb.base/solib-overlap.exp b/gdb/testsuite/gdb.base/solib-overlap.exp index 048e6cf..49e67be 100644 --- a/gdb/testsuite/gdb.base/solib-overlap.exp +++ b/gdb/testsuite/gdb.base/solib-overlap.exp @@ -52,7 +52,7 @@ set srcfile ${srcdir}/${subdir}/${testfile}.c # false PASS. # Prelink first lib1 at 0x40000000 and lib2 at 0x41000000. # During second pass try lib1 at 0x50000000 and lib2 at 0x51000000. -foreach prelink_lib1 {0x40000000 0x50000000} { with_test_prefix " $prelink_lib1:" { +foreach prelink_lib1 {0x40000000 0x50000000} { with_test_prefix "$prelink_lib1" { set prelink_lib2 [format "0x%x" [expr $prelink_lib1 + 0x01000000]] # Library file. diff --git a/gdb/testsuite/gdb.base/watch-cond-infcall.exp b/gdb/testsuite/gdb.base/watch-cond-infcall.exp index 383ce89..1c83da5 100644 --- a/gdb/testsuite/gdb.base/watch-cond-infcall.exp +++ b/gdb/testsuite/gdb.base/watch-cond-infcall.exp @@ -49,7 +49,7 @@ proc test_watchpoint { hw } { } if { ![target_info exists gdb,no_hardware_watchpoints] } { - with_test_prefix " hw:" { test_watchpoint 1 } + with_test_prefix "hw" { test_watchpoint 1 } } -with_test_prefix " sw:" { test_watchpoint 0 } +with_test_prefix "sw" { test_watchpoint 0 } diff --git a/gdb/testsuite/gdb.base/watchpoint.exp b/gdb/testsuite/gdb.base/watchpoint.exp index 7a252bb..7200f71 100644 --- a/gdb/testsuite/gdb.base/watchpoint.exp +++ b/gdb/testsuite/gdb.base/watchpoint.exp @@ -894,7 +894,7 @@ proc do_tests {} { do_tests if ![target_info exists gdb,no_hardware_watchpoints] { - with_test_prefix " no-hw:" { + with_test_prefix "no-hw" { set no_hw 1 do_tests } |