From 4f424bb1e78624c3c963bee652a587c352cb4916 Mon Sep 17 00:00:00 2001 From: Andreas Krebbel Date: Thu, 10 Oct 2013 09:54:13 +0000 Subject: [PATCH] 2013-10-10 Andreas Arnez * lib/gdb.exp (gdb_core_cmd): Replace fixed string "re-load generated corefile" by argument "$test". --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/lib/gdb.exp | 14 +++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 7fc1148eee..a9a3fb14b8 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2013-10-10 Andreas Arnez + + * lib/gdb.exp (gdb_core_cmd): Replace fixed string "re-load + generated corefile" by argument "$test". + 2013-10-09 Pedro Alves * gdb.python/py-prettyprint.exp (run_lang_tests): Adjust expected diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 6c9948f81d..3efd539b1f 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -3201,32 +3201,32 @@ proc gdb_gcore_cmd {core test} { proc gdb_core_cmd { core test } { global gdb_prompt - gdb_test_multiple "core $core" "re-load generated corefile" { + gdb_test_multiple "core $core" "$test" { -re "\\\[Thread debugging using \[^ \r\n\]* enabled\\\]\r\n" { exp_continue } -re " is not a core dump:.*\r\n$gdb_prompt $" { - fail "re-load generated corefile (bad file format)" + fail "$test (bad file format)" return -1 } -re ": No such file or directory.*\r\n$gdb_prompt $" { - fail "re-load generated corefile (file not found)" + fail "$test (file not found)" return -1 } -re "Couldn't find .* registers in core file.*\r\n$gdb_prompt $" { - fail "re-load generated corefile (incomplete note section)" + fail "$test (incomplete note section)" return 0 } -re "Core was generated by .*\r\n$gdb_prompt $" { - pass "re-load generated corefile" + pass "$test" return 1 } -re ".*$gdb_prompt $" { - fail "re-load generated corefile" + fail "$test" return -1 } timeout { - fail "re-load generated corefile (timeout)" + fail "$test (timeout)" return -1 } }