Index: gdb/testsuite/gdb.base/gcore-buffer-overflow.exp |
diff --git a/gdb/testsuite/gdb.base/gcore-buffer-overflow.exp b/gdb/testsuite/gdb.base/gcore-buffer-overflow.exp |
index 7736bb8b578f0510187caae7092ba5792603b578..47dccf9de79e78f2319c99d367bbed6ff65023c1 100644 |
--- a/gdb/testsuite/gdb.base/gcore-buffer-overflow.exp |
+++ b/gdb/testsuite/gdb.base/gcore-buffer-overflow.exp |
@@ -1,4 +1,4 @@ |
-# Copyright 2007-2012 Free Software Foundation, Inc. |
+# Copyright 2007-2013 Free Software Foundation, Inc. |
# This program is free software; you can redistribute it and/or modify |
# it under the terms of the GNU General Public License as published by |
@@ -16,12 +16,11 @@ |
# Test GDB's internal buffers safety for the GCORE command. |
-set testfile "gcore-buffer-overflow" |
-set srcfile ${testfile}.c |
+standard_testfile .c |
# The ${binfile} basename needs to exceed 80 characters (`sizeof (psargs)') |
# plus some additional data to overwrite the stack frame. |
set pattern 01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 |
-set binfile ${objdir}/${subdir}/${testfile}-${pattern} |
+append binfile -${pattern} |
if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { |
untested ${testfile}.exp |
@@ -30,17 +29,14 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb |
# Start with a fresh gdb. |
-gdb_exit |
-gdb_start |
-gdb_reinitialize_dir $srcdir/$subdir |
-gdb_load ${binfile} |
+clean_restart ${binfile} |
# Does this gdb support gcore? |
gdb_test_multiple "help gcore" "help gcore" { |
-re "Undefined command: .gcore.*$gdb_prompt $" { |
# gcore command not supported -- nothing to test here. |
unsupported "gdb does not support gcore on this target" |
- return -1; |
+ return -1 |
} |
-re "Save a core file .*$gdb_prompt $" { |
pass "help gcore" |
@@ -55,17 +51,5 @@ if { ! [ runto_main ] } then { |
return -1 |
} |
-set escapedfilename [string_to_regexp ${objdir}/${subdir}/gcore-buffer-overflow.test] |
- |
-set test "save a corefile" |
-gdb_test_multiple "gcore ${objdir}/${subdir}/gcore-buffer-overflow.test" $test { |
- -re "Saved corefile ${escapedfilename}\[\r\n\]+$gdb_prompt $" { |
- pass $test |
- } |
- -re "Can't create a corefile\[\r\n\]+$gdb_prompt $" { |
- unsupported $test |
- } |
- eof { |
- fail $test |
- } |
-} |
+gdb_gcore_cmd [standard_output_file gcore-buffer-overflow.test] \ |
+ "save a corefile" |