espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-25 21:41:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

gdb.base/skip.exp: Use with_test_prefix.

Browse Source 
gdb/testsuite/ChangeLog:

	* gdb.base/skip.exp: Use with_test_prefix.
This commit is contained in:
Doug Evans
2016-03-03 10:49:28 -08:00
parent 57aa174243
commit bdf7e23048
2 changed files with 144 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,7 @@
2016-03-03 Doug Evans <dje@google.com>
* gdb.base/skip.exp: Use with_test_prefix.
2016-03-03 Yao Qi <yao.qi@linaro.org> 2016-03-03 Yao Qi <yao.qi@linaro.org>
* gdb.base/step-over-syscall.exp (step_over_syscall): Kfail. * gdb.base/step-over-syscall.exp (step_over_syscall): Kfail.

263
gdb/testsuite/gdb.base/skip.exp
View File

@ -94,113 +94,125 @@ if ![runto_main] {
fail "Can't run to main" fail "Can't run to main"
return return
} }
gdb_test "step" ".*" "step in the main" gdb_test "step" ".*" "step in the main"
gdb_test "bt" "\\s*\\#0\\s+main.*" "step after all ignored" gdb_test "bt" "\\s*\\#0\\s+main.*" "step after all ignored"
# Now remove skip.c from the skiplist. Our first step should take us # Now remove skip.c from the skiplist. Our first step should take us
# into foo(), and our second step should take us to the next line in main(). # into foo(), and our second step should take us to the next line in main().
gdb_test "skip delete 1" with_test_prefix "step after deleting 1" {
# Check that entry 1 is missing from |info skip| gdb_test "skip delete 1"
gdb_test "info skip" \ # Check that entry 1 is missing from |info skip|
"Num\\s+Enb\\s+Glob\\s+File\\s+RE\\s+Function\\s* gdb_test "info skip" \
"Num\\s+Enb\\s+Glob\\s+File\\s+RE\\s+Function\\s*
2\\s+y\\s+n\\s+<none>\\s+n\\s+main\\s* 2\\s+y\\s+n\\s+<none>\\s+n\\s+main\\s*
3\\s+y\\s+n\\s+$srcfile1\\s+n\\s+<none>\\s* 3\\s+y\\s+n\\s+$srcfile1\\s+n\\s+<none>\\s*
4\\s+y\\s+n\\s+<none>\\s+n\\s+baz\\s*" \ 4\\s+y\\s+n\\s+<none>\\s+n\\s+baz\\s*" \
"info skip (delete 1)" "info skip (delete 1)"
if ![runto_main] { if ![runto_main] {
fail "Can't run to main" fail "Can't run to main"
return return
}
gdb_test "step" "foo \\(\\) at.*" "step 1"
gdb_test "step" ".*" "step 2" ; # Return from foo()
gdb_test "step" "main \\(\\) at.*" "step 3"
} }
set test "step after deleting 1"
gdb_test "step" "foo \\(\\) at.*" "$test (1)"
gdb_test "step" ".*" "$test (2)" ; # Return from foo()
gdb_test "step" "main \\(\\) at.*" "$test (3)"
# Now disable the skiplist entry for skip1.c. We should now # Now disable the skiplist entry for skip1.c. We should now
# step into foo(), then into bar(), but not into baz(). # step into foo(), then into bar(), but not into baz().
gdb_test "skip disable 3" with_test_prefix "step after disabling 3" {
# Is entry 3 disabled in |info skip|? gdb_test "skip disable 3"
gdb_test "info skip 3" \ # Is entry 3 disabled in |info skip|?
"3\\s+n\\s+n\\s+$srcfile1\\s+n\\s+<none>\\s*" \ gdb_test "info skip 3" \
"info skip shows entry as disabled" "3\\s+n\\s+n\\s+$srcfile1\\s+n\\s+<none>\\s*" \
"info skip shows entry as disabled"
if ![runto_main] { if ![runto_main] {
fail "Can't run to main" fail "Can't run to main"
return return
}
gdb_test "step" "bar \\(\\) at.*" "step 1"
gdb_test "step" ".*" "step 2"; # Return from foo()
gdb_test "step" "foo \\(\\) at.*" "step 3"
gdb_test "step" ".*" "step 4"; # Return from bar()
gdb_test "step" "main \\(\\) at.*" "step 5"
} }
set test "step after disabling 3"
gdb_test "step" "bar \\(\\) at.*" "$test (1)"
gdb_test "step" ".*" "$test (2)"; # Return from foo()
gdb_test "step" "foo \\(\\) at.*" "$test (3)"
gdb_test "step" ".*" "$test (4)"; # Return from bar()
gdb_test "step" "main \\(\\) at.*" "$test (5)"
# Enable skiplist entry 3 and make sure we step over it like before. # Enable skiplist entry 3 and make sure we step over it like before.
gdb_test "skip enable 3" with_test_prefix "step after enable 3" {
# Is entry 3 enabled in |info skip|? gdb_test "skip enable 3"
gdb_test "info skip 3" \ # Is entry 3 enabled in |info skip|?
"3\\s+y\\s+n\\s+$srcfile1\\s+n\\s+<none>\\s*" \ gdb_test "info skip 3" \
"info skip shows entry as enabled" "3\\s+y\\s+n\\s+$srcfile1\\s+n\\s+<none>\\s*" \
if ![runto_main] { "info skip shows entry as enabled"
fail "Can't run to main"
return
}
set test "step after enable 3"
gdb_test "step" "foo \\(\\) at.*" "$test (1)"
gdb_test "step" ".*" "$test (2)"; # Return from foo()
gdb_test "step" "main \\(\\) at.*" "$test (3)"
gdb_test "skip disable" if ![runto_main] {
gdb_test "info skip" \ fail "Can't run to main"
"Num\\s+Enb\\s+Glob\\s+File\\s+RE\\s+Function\\s* return
}
gdb_test "step" "foo \\(\\) at.*" "step 1"
gdb_test "step" ".*" "step 2"; # Return from foo()
gdb_test "step" "main \\(\\) at.*" "step 3"
}
# Admin tests (disable,enable,delete).
with_test_prefix "admin" {
gdb_test "skip disable"
gdb_test "info skip" \
"Num\\s+Enb\\s+Glob\\s+File\\s+RE\\s+Function\\s*
2\\s+n\\s+n\\s+<none>\\s+n\\s+main\\s* 2\\s+n\\s+n\\s+<none>\\s+n\\s+main\\s*
3\\s+n\\s+n\\s+$srcfile1\\s+n\\s+<none>\\s* 3\\s+n\\s+n\\s+$srcfile1\\s+n\\s+<none>\\s*
4\\s+n\\s+n\\s+<none>\\s+n\\s+baz\\s*" \ 4\\s+n\\s+n\\s+<none>\\s+n\\s+baz\\s*" \
"info skip after disabling all" "info skip after disabling all"
gdb_test "skip enable" gdb_test "skip enable"
gdb_test "info skip" \ gdb_test "info skip" \
"Num\\s+Enb\\s+Glob\\s+File\\s+RE\\s+Function\\s* "Num\\s+Enb\\s+Glob\\s+File\\s+RE\\s+Function\\s*
2\\s+y\\s+n\\s+<none>\\s+n\\s+main\\s* 2\\s+y\\s+n\\s+<none>\\s+n\\s+main\\s*
3\\s+y\\s+n\\s+$srcfile1\\s+n\\s+<none>\\s* 3\\s+y\\s+n\\s+$srcfile1\\s+n\\s+<none>\\s*
4\\s+y\\s+n\\s+<none>\\s+n\\s+baz\\s*" \ 4\\s+y\\s+n\\s+<none>\\s+n\\s+baz\\s*" \
"info skip after enabling all" "info skip after enabling all"
gdb_test "skip disable 4 2-3" gdb_test "skip disable 4 2-3"
gdb_test "info skip" \ gdb_test "info skip" \
"Num\\s+Enb\\s+Glob\\s+File\\s+RE\\s+Function\\s* "Num\\s+Enb\\s+Glob\\s+File\\s+RE\\s+Function\\s*
2\\s+n\\s+n\\s+<none>\\s+n\\s+main\\s* 2\\s+n\\s+n\\s+<none>\\s+n\\s+main\\s*
3\\s+n\\s+n\\s+$srcfile1\\s+n\\s+<none>\\s* 3\\s+n\\s+n\\s+$srcfile1\\s+n\\s+<none>\\s*
4\\s+n\\s+n\\s+<none>\\s+n\\s+baz\\s*" \ 4\\s+n\\s+n\\s+<none>\\s+n\\s+baz\\s*" \
"info skip after disabling 4 2-3" "info skip after disabling 4 2-3"
gdb_test "skip enable 2-3" gdb_test "skip enable 2-3"
gdb_test "info skip" \ gdb_test "info skip" \
"Num\\s+Enb\\s+Glob\\s+File\\s+RE\\s+Function\\s* "Num\\s+Enb\\s+Glob\\s+File\\s+RE\\s+Function\\s*
2\\s+y\\s+n\\s+<none>\\s+n\\s+main\\s* 2\\s+y\\s+n\\s+<none>\\s+n\\s+main\\s*
3\\s+y\\s+n\\s+$srcfile1\\s+n\\s+<none>\\s* 3\\s+y\\s+n\\s+$srcfile1\\s+n\\s+<none>\\s*
4\\s+n\\s+n\\s+<none>\\s+n\\s+baz\\s*" \ 4\\s+n\\s+n\\s+<none>\\s+n\\s+baz\\s*" \
"info skip after enabling 2-3" "info skip after enabling 2-3"
gdb_test "info skip 2-3" \ gdb_test "info skip 2-3" \
"Num\\s+Enb\\s+Glob\\s+File\\s+RE\\s+Function\\s* "Num\\s+Enb\\s+Glob\\s+File\\s+RE\\s+Function\\s*
2\\s+y\\s+n\\s+<none>\\s+n\\s+main\\s* 2\\s+y\\s+n\\s+<none>\\s+n\\s+main\\s*
3\\s+y\\s+n\\s+$srcfile1\\s+n\\s+<none>\\s*" \ 3\\s+y\\s+n\\s+$srcfile1\\s+n\\s+<none>\\s*" \
"info skip 2-3" "info skip 2-3"
gdb_test "skip delete 2 3" gdb_test "skip delete 2 3"
gdb_test "info skip" \ gdb_test "info skip" \
"Num\\s+Enb\\s+Glob\\s+File\\s+RE\\s+Function\\s* "Num\\s+Enb\\s+Glob\\s+File\\s+RE\\s+Function\\s*
4\\s+n\\s+n\\s+<none>\\s+n\\s+baz\\s*" \ 4\\s+n\\s+n\\s+<none>\\s+n\\s+baz\\s*" \
"info skip after deleting 2 3" "info skip after deleting 2 3"
gdb_test "skip delete" gdb_test "skip delete"
gdb_test "info skip" "Not skipping any files or functions\." \ gdb_test "info skip" "Not skipping any files or functions\." \
"info skip after deleting all" "info skip after deleting all"
}
# Now test skip -fi, etc. # Now test skip -fi, etc.
@ -210,75 +222,80 @@ gdb_test "skip -gfi sk*1.c" "File\\(s\\) sk\\*1.c will be skipped when stepping\
gdb_test "skip -fu baz" "Function baz will be skipped when stepping\." gdb_test "skip -fu baz" "Function baz will be skipped when stepping\."
gdb_test "skip -rfu ^b.z$" "Function\\(s\\) \\^b\\.z\\$ will be skipped when stepping." gdb_test "skip -rfu ^b.z$" "Function\\(s\\) \\^b\\.z\\$ will be skipped when stepping."
if ![runto_main] { with_test_prefix "step using -fi" {
fail "Can't run to main" if ![runto_main] {
return fail "Can't run to main"
return
}
gdb_test_no_output "skip disable"
gdb_test_no_output "skip enable 5"
gdb_test "step" "foo \\(\\) at.*" "step 1"
gdb_test "step" ".*" "step 2"; # Return from foo()
gdb_test "step" "main \\(\\) at.*" "step 3"
} }
set test "step using -fi" with_test_prefix "step using -gfi" {
gdb_test_no_output "skip disable" if ![runto_main] {
gdb_test_no_output "skip enable 5" fail "Can't run to main"
gdb_test "step" "foo \\(\\) at.*" "$test (1)" return
gdb_test "step" ".*" "$test (2)"; # Return from foo() }
gdb_test "step" "main \\(\\) at.*" "$test (3)"
if ![runto_main] { gdb_test_no_output "skip disable"
fail "Can't run to main" gdb_test_no_output "skip enable 6"
return gdb_test "step" "foo \\(\\) at.*" "step 1"
gdb_test "step" ".*" "step 2"; # Return from foo()
gdb_test "step" "main \\(\\) at.*" "step 3"
} }
set test "step using -gfi" with_test_prefix "step using -fu for baz" {
gdb_test_no_output "skip disable" if ![runto_main] {
gdb_test_no_output "skip enable 6" fail "Can't run to main"
gdb_test "step" "foo \\(\\) at.*" "$test (1)" return
gdb_test "step" ".*" "$test (2)"; # Return from foo() }
gdb_test "step" "main \\(\\) at.*" "$test (3)"
if ![runto_main] { gdb_test_no_output "skip disable"
fail "Can't run to main" gdb_test_no_output "skip enable 7"
return gdb_test "step" "bar \\(\\) at.*" "step 1"
gdb_test "step" ".*" "step 2"; # Return from bar()
gdb_test "step" "foo \\(\\) at.*" "step 3"
gdb_test "step" ".*" "step 4"; # Return from foo()
gdb_test "step" "main \\(\\) at.*" "step 5"
} }
set test "step using -fu for baz" with_test_prefix "step using -rfu for baz" {
gdb_test_no_output "skip disable" if ![runto_main] {
gdb_test_no_output "skip enable 7" fail "Can't run to main"
gdb_test "step" "bar \\(\\) at.*" "$test (1)" return
gdb_test "step" ".*" "$test (2)"; # Return from bar() }
gdb_test "step" "foo \\(\\) at.*" "$test (3)"
gdb_test "step" ".*" "$test (4)"; # Return from foo()
gdb_test "step" "main \\(\\) at.*" "$test (5)"
if ![runto_main] { gdb_test_no_output "skip disable"
fail "Can't run to main" gdb_test_no_output "skip enable 8"
return gdb_test "step" "bar \\(\\) at.*" "step 1"
gdb_test "step" ".*" "step 2"; # Return from bar()
gdb_test "step" "foo \\(\\) at.*" "step 3"
gdb_test "step" ".*" "step 4"; # Return from foo()
gdb_test "step" "main \\(\\) at.*" "step 5"
} }
set test "step using -rfu for baz"
gdb_test_no_output "skip disable"
gdb_test_no_output "skip enable 8"
gdb_test "step" "bar \\(\\) at.*" "$test (1)"
gdb_test "step" ".*" "$test (2)"; # Return from bar()
gdb_test "step" "foo \\(\\) at.*" "$test (3)"
gdb_test "step" ".*" "$test (4)"; # Return from foo()
gdb_test "step" "main \\(\\) at.*" "$test (5)"
# Test -fi + -fu. # Test -fi + -fu.
if ![runto_main] { with_test_prefix "step using -fi + -fu" {
fail "Can't run to main" if ![runto_main] {
return fail "Can't run to main"
} return
}
set test "step using -fi + -fu" gdb_test_no_output "skip delete"
gdb_test_no_output "skip delete" gdb_test "skip -fi skip1.c -fu test_skip" \
gdb_test "skip -fi skip1.c -fu test_skip" \ "Function test_skip in file skip1.c will be skipped when stepping\."
"Function test_skip in file skip1.c will be skipped when stepping\." gdb_breakpoint "test_skip_file_and_function"
gdb_breakpoint "test_skip_file_and_function" gdb_breakpoint "end_test_skip_file_and_function"
gdb_breakpoint "end_test_skip_file_and_function" gdb_test "call test_skip_file_and_function ()" "silently stop."
gdb_test "call test_skip_file_and_function ()" "silently stop." # Verify we can step into skip.c:test_skip but not skip1.c:test_skip.
# Verify we can step into skip.c:test_skip but not skip1.c:test_skip. gdb_test "step" "test_skip \\(\\) at.*" "step 1"
gdb_test "step" "test_skip \\(\\) at.*" "$test (1)" gdb_test "step" "test_skip_file_and_function \\(\\) at.*" "step 2"; # Return from test_skip()
gdb_test "step" "test_skip_file_and_function \\(\\) at.*" "$test (2)"; # Return from test_skip() gdb_test "step" "skip1_test_skip_file_and_function \\(\\) at.*" "step 3"
gdb_test "step" "skip1_test_skip_file_and_function \\(\\) at.*" "$test (4)" gdb_test "step" ".*" "step 4"; # Skip over test_skip()
gdb_test "step" ".*" "$test (5)"; # Skip over test_skip() gdb_test "step" "test_skip_file_and_function \\(\\) at.*" "step 5"; # Return from skip1_test_skip_file_and_function()
gdb_test "step" "test_skip_file_and_function \\(\\) at.*" "$test (6)"; # Return from skip1_test_skip_file_and_function() }