2013-10-10 Andreas Arnez <arnez@linux.vnet.ibm.com>

	* lib/gdb.exp (gdb_core_cmd): Replace fixed string "re-load
	generated corefile" by argument "$test".

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 7fc1148..a9a3fb1 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-10  Andreas Arnez  <arnez@linux.vnet.ibm.com>
+
+       * lib/gdb.exp (gdb_core_cmd): Replace fixed string "re-load
+       generated corefile" by argument "$test".
+
 2013-10-09  Pedro Alves  <palves@redhat.com>
 
        * 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 6c9948f..3efd539 100644 (file)
--- 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
        }
     }