From 11315ae03c2dce34c8c3b840eaa1109b0011c99f Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Thu, 2 Aug 2012 15:59:59 +0000 Subject: [PATCH] * gdb.base/annota1.exp: Accept no frames-invalid notification when starting up the program. * gdb.python/py-value.exp (test_value_numeric_ops): Pointers may show a symbolic value as well. * gdb.server/server-exec-info.exp: Skip test when skipping gdbserver test and/or when skipping shared library tests. * gdb.threads/linux-dp.exp: Unset "seen" when done with it to avoid name conflicts with other tests. --- gdb/testsuite/ChangeLog | 11 +++++++++++ gdb/testsuite/gdb.base/annota1.exp | 2 +- gdb/testsuite/gdb.python/py-value.exp | 4 ++-- gdb/testsuite/gdb.server/server-exec-info.exp | 7 +++++++ gdb/testsuite/gdb.threads/linux-dp.exp | 1 + 5 files changed, 22 insertions(+), 3 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 0d86bb1..e587e28 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,16 @@ 2012-08-02 Ulrich Weigand + * gdb.base/annota1.exp: Accept no frames-invalid notification + when starting up the program. + * gdb.python/py-value.exp (test_value_numeric_ops): Pointers may + show a symbolic value as well. + * gdb.server/server-exec-info.exp: Skip test when skipping + gdbserver test and/or when skipping shared library tests. + * gdb.threads/linux-dp.exp: Unset "seen" when done with it to + avoid name conflicts with other tests. + +2012-08-02 Ulrich Weigand + * gdb.dwarf2/dw2-icc-opaque.S: Remove .align directives. Fix wrong output on big-endian systems. * gdb.dwarf2/dw2-icc-opaque.exp: Expect @mode32 attribute on diff --git a/gdb/testsuite/gdb.base/annota1.exp b/gdb/testsuite/gdb.base/annota1.exp index 1cbc933..98b4650 100644 --- a/gdb/testsuite/gdb.base/annota1.exp +++ b/gdb/testsuite/gdb.base/annota1.exp @@ -133,7 +133,7 @@ gdb_test_multiple "info break" "breakpoint info" { #exp_internal 1 set binexp [string_to_regexp $binfile] gdb_test_multiple "run" "run until main breakpoint" { - -re "\r\n\032\032post-prompt\r\nStarting program: $binexp \(\r\nwarning: Skipping \[^\r\n\]+ .gdb_index section in \[^\r\n\]+\r\nDo \"set use-deprecated-index-sections on\" before the file is read\r\nto use the section anyway\\.\)?\(\(\r\n\r\n\032\032frames-invalid\)|\(\r\n\r\n\032\032breakpoints-invalid\)\)+\r\n\r\n\032\032starting\(\(\r\n\r\n\032\032frames-invalid\)|\(\r\n\r\n\032\032breakpoints-invalid\)\)*\r\n\r\n\032\032breakpoint 1\r\n\r\nBreakpoint 1, \r\n\032\032frame-begin 0 $hex\r\n\r\n\032\032frame-function-name\r\nmain\r\n\032\032frame-args\r\n \\(\\)\r\n\032\032frame-source-begin\r\n at \r\n\032\032frame-source-file\r\n.*annota1.c\r\n\032\032frame-source-file-end\r\n:\r\n\032\032frame-source-line\r\n$main_line\r\n\032\032frame-source-end\r\n\r\n\r\n\032\032source.*$srcfile:$main_line:.*:beg:$hex\r\n\r\n\032\032frame-end\r\n\r\n\032\032stopped.*$gdb_prompt$" { + -re "\r\n\032\032post-prompt\r\nStarting program: $binexp \(\r\nwarning: Skipping \[^\r\n\]+ .gdb_index section in \[^\r\n\]+\r\nDo \"set use-deprecated-index-sections on\" before the file is read\r\nto use the section anyway\\.\)?\(\(\r\n\r\n\032\032frames-invalid\)|\(\r\n\r\n\032\032breakpoints-invalid\)\)*\r\n\r\n\032\032starting\(\(\r\n\r\n\032\032frames-invalid\)|\(\r\n\r\n\032\032breakpoints-invalid\)\)*\r\n\r\n\032\032breakpoint 1\r\n\r\nBreakpoint 1, \r\n\032\032frame-begin 0 $hex\r\n\r\n\032\032frame-function-name\r\nmain\r\n\032\032frame-args\r\n \\(\\)\r\n\032\032frame-source-begin\r\n at \r\n\032\032frame-source-file\r\n.*annota1.c\r\n\032\032frame-source-file-end\r\n:\r\n\032\032frame-source-line\r\n$main_line\r\n\032\032frame-source-end\r\n\r\n\r\n\032\032source.*$srcfile:$main_line:.*:beg:$hex\r\n\r\n\032\032frame-end\r\n\r\n\032\032stopped.*$gdb_prompt$" { pass "run until main breakpoint" } } diff --git a/gdb/testsuite/gdb.python/py-value.exp b/gdb/testsuite/gdb.python/py-value.exp index acfd89b..87b0734 100644 --- a/gdb/testsuite/gdb.python/py-value.exp +++ b/gdb/testsuite/gdb.python/py-value.exp @@ -100,8 +100,8 @@ proc test_value_numeric_ops {} { gdb_test "print (void *) 5" ".*" "" gdb_test_no_output "python b = gdb.history (0)" "" - gdb_test "python print 'result = ' + str(a+5)" " = 0x7" "add pointer value with python integer" - gdb_test "python print 'result = ' + str(b-2)" " = 0x3" "subtract python integer from pointer value" + gdb_test "python print 'result = ' + str(a+5)" " = 0x7( <.*>)?" "add pointer value with python integer" + gdb_test "python print 'result = ' + str(b-2)" " = 0x3( <.*>)?" "subtract python integer from pointer value" gdb_test "python print 'result = ' + str(b-a)" " = 3" "subtract two pointer values" # Test some invalid operations. diff --git a/gdb/testsuite/gdb.server/server-exec-info.exp b/gdb/testsuite/gdb.server/server-exec-info.exp index 00775f1..6635805 100644 --- a/gdb/testsuite/gdb.server/server-exec-info.exp +++ b/gdb/testsuite/gdb.server/server-exec-info.exp @@ -15,6 +15,13 @@ load_lib gdbserver-support.exp +# We test for skip_shlib_tests in this test because without a main +# exec file we only have the exec target loaded if shared libraries +# are present. +if {[skip_gdbserver_tests] || [skip_shlib_tests]} { + return +} + standard_testfile server.c if [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] { return -1 diff --git a/gdb/testsuite/gdb.threads/linux-dp.exp b/gdb/testsuite/gdb.threads/linux-dp.exp index 38f78ef..ca65d10 100644 --- a/gdb/testsuite/gdb.threads/linux-dp.exp +++ b/gdb/testsuite/gdb.threads/linux-dp.exp @@ -342,6 +342,7 @@ for {set i 1} {$i <= $nthreads} {incr i} { set any_interesting 1 } } +unset seen if {$any_interesting} { pass "found an interesting thread" -- 2.7.4