[gdb/testsuite] Fix regexps in gdb.base/step-over-syscall.exp
When running test-case gdb.base/step-over-syscall.exp without glibc debuginfo installed, I get: ... (gdb) continue^M Continuing.^M ^M Breakpoint 2, 0x00007ffff7d4405e in vfork () from /lib64/libc.so.6^M (gdb) PASS: gdb.base/step-over-syscall.exp: vfork: displaced=off: \ continue to vfork (1st time) ... but with glibc debuginfo installed I get instead: ... (gdb) continue^M Continuing.^M ^M Breakpoint 2, 0x00007ffff7d4405e in __libc_vfork () at \ ../sysdeps/unix/sysv/linux/x86_64/vfork.S:44^M 44 ENTRY (__vfork)^M (gdb) FAIL: gdb.base/step-over-syscall.exp: vfork: displaced=off: \ continue to vfork (1st time) ... The FAIL is due to a mismatch with regexp: ... "Breakpoint \[0-9\]+, (.* in |__libc_|)$syscall \\(\\).*" ... because it cannot match both ".* in " and the __libc_ prefix. Fix this by using instead the regexp: ... "Breakpoint \[0-9\]+, (.* in )?(__libc_)?$syscall \\(\\).*" ... Tested on x86_64-linux.
This commit is contained in:
parent
4200337219
commit
906c2c6564
@ -127,13 +127,13 @@ proc setup { syscall } {
|
||||
|
||||
gdb_test "break \*$syscall" "Breakpoint \[0-9\]* at .*"
|
||||
|
||||
gdb_test "continue" "Continuing\\..*Breakpoint \[0-9\]+, (.* in |__libc_|)$syscall \\(\\).*" \
|
||||
gdb_test "continue" "Continuing\\..*Breakpoint \[0-9\]+, (.* in )?(__libc_)?$syscall \\(\\).*" \
|
||||
"continue to $syscall (1st time)"
|
||||
# Hit the breakpoint on $syscall for the first time. In this time,
|
||||
# we will let PLT resolution done, and the number single steps we will
|
||||
# do later will be reduced.
|
||||
|
||||
gdb_test "continue" "Continuing\\..*Breakpoint \[0-9\]+, (.* in |__libc_|)$syscall \\(\\).*" \
|
||||
gdb_test "continue" "Continuing\\..*Breakpoint \[0-9\]+, (.* in )?(__libc_)?$syscall \\(\\).*" \
|
||||
"continue to $syscall (2nd time)"
|
||||
# Hit the breakpoint on $syscall for the second time. In this time,
|
||||
# the address of syscall insn and next insn of syscall are recorded.
|
||||
@ -264,7 +264,7 @@ proc step_over_syscall { syscall } {
|
||||
return -1
|
||||
}
|
||||
|
||||
gdb_test "continue" "Continuing\\..*Breakpoint \[0-9\]+, (.* in |__libc_|)$syscall \\(\\).*" \
|
||||
gdb_test "continue" "Continuing\\..*Breakpoint \[0-9\]+, (.* in )?(__libc_)?$syscall \\(\\).*" \
|
||||
"continue to $syscall (3rd time)"
|
||||
|
||||
# Hit the breakpoint on $syscall for the third time. In this time, we'll set
|
||||
@ -332,7 +332,7 @@ proc break_cond_on_syscall { syscall follow_fork detach_on_fork } {
|
||||
return -1
|
||||
}
|
||||
|
||||
gdb_test "continue" "Continuing\\..*Breakpoint \[0-9\]+, (.* in |__libc_|)$syscall \\(\\).*" \
|
||||
gdb_test "continue" "Continuing\\..*Breakpoint \[0-9\]+, (.* in )?(__libc_)?$syscall \\(\\).*" \
|
||||
"continue to $syscall"
|
||||
# Delete breakpoint syscall insns to avoid interference with other syscalls.
|
||||
delete_breakpoints
|
||||
|
Loading…
x
Reference in New Issue
Block a user