FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gdb/testsuite: Remove duplicates from gdb.mi/mi-catch-load.exp

Browse source 
When I run the testsuite, I have:

    Running .../gdb/testsuite/gdb.mi/mi-catch-load.exp ...
    DUPLICATE: gdb.mi/mi-catch-load.exp: breakpoint at main
    DUPLICATE: gdb.mi/mi-catch-load.exp: mi runto main

Fix by grouping the various phases in with_test_prefix blocks.  Since
the tests now have a prefix, remove the manually written prefixes in
testnames.

Also change some messages with the pattern "(timeout) $testname" into
"$estname (timeout)" since tools will handle this as $testname[1] (which
is what we want in this particular scenario).

Tested on x86_64-linux.

[1] https://sourceware.org/gdb/wiki/GDBTestcaseCookbook#Do_not_use_.22tail_parentheses.22_on_test_messages
This commit is contained in:
Lancelot SIX 2021-11-22 22:36:47 +00:00
parent 4df98d9d31
commit 202fb84085
1 changed files with 41 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
gdb/testsuite/gdb.mi/mi-catch-load.exp
View file

@ -40,48 +40,53 @@ if { [gdb_compile_shlib "${srcdir}/${subdir}/${srcfile2}" ${binfile2} {debug}] !
return -1
}
mi_clean_restart $binfile
mi_runto_main
# test -catch-load
mi_gdb_test "111-gdb-set auto-solib-add on" "111\\^done" "catch-load: auto-solib-add on"
mi_gdb_test "222-catch-load -t mi-catch-load-so.so*" \
"222\\^done,bkpt=\{number=\"2\",type=\"catchpoint\",disp=\"del\",enabled=\"y\",what=\"load of library matching mi-catch-load-so\.so\\*\",catch-type=\"load\",thread-groups=\\\[\"i1\"\\\],times=\"0\"\}" \
"catch-load: catch load"
mi_send_resuming_command "exec-continue" "catch-load: continue"
with_test_prefix "catch-load" {
mi_clean_restart $binfile
mi_runto_main
gdb_expect {
-re "\\*stopped.*reason=\"solib-event\".*added=.*\r\n.*\r\n$mi_gdb_prompt$" {
pass "catch-load: solib-event stop"
}
-re ".*$mi_gdb_prompt$" {
setup_kfail mi/15945 *-*-*mingw*
fail "catch-load: solib-event stop"
}
timeout {
fail "(timeout) catch-load: solib-event stop"
mi_gdb_test "111-gdb-set auto-solib-add on" "111\\^done" \
"auto-solib-add on"
mi_gdb_test "222-catch-load -t mi-catch-load-so.so*" \
"222\\^done,bkpt=\{number=\"2\",type=\"catchpoint\",disp=\"del\",enabled=\"y\",what=\"load of library matching mi-catch-load-so\.so\\*\",catch-type=\"load\",thread-groups=\\\[\"i1\"\\\],times=\"0\"\}" \
"catch load"
mi_send_resuming_command "exec-continue" "continue"
gdb_expect {
-re "\\*stopped.*reason=\"solib-event\".*added=.*\r\n.*\r\n$mi_gdb_prompt$" {
pass "solib-event stop"
}
-re ".*$mi_gdb_prompt$" {
setup_kfail mi/15945 *-*-*mingw*
fail "solib-event stop"
}
timeout {
fail "solib-event stop (timeout)"
}
}
}
mi_clean_restart $binfile
mi_runto_main
# test -catch-unload
mi_gdb_test "111-gdb-set auto-solib-add on" "111\\^done" "catch-unload: auto-solib-add on"
mi_gdb_test "222-catch-unload -t mi-catch-load-so.so*" \
"222\\^done,bkpt=\{number=\"2\",type=\"catchpoint\",disp=\"del\",enabled=\"y\",what=\"unload of library matching mi-catch-load-so\.so\\*\",catch-type=\"unload\",thread-groups=\\\[\"i1\"\\\],times=\"0\"\}" \
"catch-unload: catch unload"
mi_send_resuming_command "exec-continue" "catch-unload: continue"
with_test_prefix "catch-unload" {
mi_clean_restart $binfile
mi_runto_main
gdb_expect {
-re "\\*stopped.*reason=\"solib-event\".*removed=.*\r\n.*\r\n$mi_gdb_prompt$" {
pass "catch-unload: solib-event stop"
}
-re ".*$mi_gdb_prompt$" {
setup_kfail mi/15945 *-*-*mingw*
fail "catch-unload: solib-event stop"
}
timeout {
fail "(timeout) catch-unload: solib-event stop"
mi_gdb_test "111-gdb-set auto-solib-add on" "111\\^done" "auto-solib-add on"
mi_gdb_test "222-catch-unload -t mi-catch-load-so.so*" \
"222\\^done,bkpt=\{number=\"2\",type=\"catchpoint\",disp=\"del\",enabled=\"y\",what=\"unload of library matching mi-catch-load-so\.so\\*\",catch-type=\"unload\",thread-groups=\\\[\"i1\"\\\],times=\"0\"\}" \
"catch unload"
mi_send_resuming_command "exec-continue" "continue"
gdb_expect {
-re "\\*stopped.*reason=\"solib-event\".*removed=.*\r\n.*\r\n$mi_gdb_prompt$" {
pass "solib-event stop"
}
-re ".*$mi_gdb_prompt$" {
setup_kfail mi/15945 *-*-*mingw*
fail "solib-event stop"
}
timeout {
fail "solib-event stop (timeout)"
}
}
}