* gdb/testsuite/gdb.asm/m68k.inc (gdbasm_call): Use jsr.

	* gdb/testsuite/gdb.base/fileio.c (stop): New.  Call it everywhere
	the debugger should stop.
	* gdb/testsuite/gdb.base/fileio.exp: Add breakpoint to stop
	routine and adjust.
	* gdb/testsuite/gdb.base/charset.exp: Specify source file for
	breakpoint address.

2 files changed, 53 insertions, 76 deletions

diff --git a/ChangeLog.csl b/ChangeLog.csl
index e58185f5117..4272861191e 100644
--- a/ChangeLog.csl
+++ b/ChangeLog.csl
@@ -3,8 +3,10 @@
 	* gdb/testsuite/gdb.asm/m68k.inc (gdbasm_call): Use jsr.
 	* gdb/testsuite/gdb.base/fileio.c (stop): New.  Call it everywhere
 	the debugger should stop.
-	* gdb/testsuite/gdb.base/charset.exp: Add breakpoint to stop
+	* gdb/testsuite/gdb.base/fileio.exp: Add breakpoint to stop
 	routine and adjust.
+	* gdb/testsuite/gdb.base/charset.exp: Specify source file for
+	breakpoint address.
 
 	* gdb/m68k-tdep.c (M68K_FPREG_SIZE): Remove.
 	(REGISTER_BYTES_FP): Use tdep->fpreg_type.
diff --git a/gdb/testsuite/gdb.base/fileio.exp b/gdb/testsuite/gdb.base/fileio.exp
index 2a717bff182..1da8b16a158 100644
--- a/gdb/testsuite/gdb.base/fileio.exp
+++ b/gdb/testsuite/gdb.base/fileio.exp
@@ -69,159 +69,141 @@ if ![runto_main] then {
     continue
 }
 
-send_gdb "tbreak 81\n" ; gdb_expect -re "$gdb_prompt $"
+send_gdb "break stop\n" ; gdb_expect -re "Breakpoint .*$srcfile.*$gdb_prompt $"
+set stop_msg ".*Breakpoint .* stop \\(\\) at.*$srcfile:.*static void stop \\(\\) {}.*"
+
 gdb_test continue \
-"Continuing\\..*open 1:.*OK.*test_open \\(\\) at.*$srcfile:81.*" \
+"Continuing\\..*open 1:.*OK$stop_msg" \
 "Open a file"
 
-send_gdb "tbreak 88\n" ; gdb_expect -re "$gdb_prompt $"
 gdb_test continue \
-"Continuing\\..*open 2:.*EEXIST.*test_open \\(\\) at.*$srcfile:88.*" \
+"Continuing\\..*open 2:.*EEXIST$stop_msg" \
 "Creating already existing file returns EEXIST"
 
-send_gdb "tbreak 95\n" ; gdb_expect -re "$gdb_prompt $"
 gdb_test continue \
-"Continuing\\..*open 3:.*EISDIR.*test_open \\(\\) at.*$srcfile:95.*" \
+"Continuing\\..*open 3:.*EISDIR$stop_msg" \
 "Open directory for writing returns EISDIR"
 
-send_gdb "tbreak 102\n" ; gdb_expect -re "$gdb_prompt $"
 gdb_test continue \
-"Continuing\\..*open 4:.*ENOENT.*test_open \\(\\) at.*$srcfile:102.*" \
+"Continuing\\..*open 4:.*ENOENT$stop_msg" \
 "Opening nonexistant file returns ENOENT"
 
-send_gdb "tbreak 109\n" ; gdb_expect -re "$gdb_prompt $"
 send_gdb "continue\n" ; gdb_expect -re "$gdb_prompt $"
 catch "system \"chmod -f -w nowrt.fileio.test\""
 
-send_gdb "tbreak 119\n" ; gdb_expect -re "$gdb_prompt $"
 gdb_test continue \
-"Continuing\\..*open 5:.*EACCES.*test_open \\(\\) at.*$srcfile:119.*" \
+"Continuing\\..*open 5:.*EACCES$stop_msg" \
 "Open for write but no write permission returns EACCES"
 
-send_gdb "tbreak 140\n" ; gdb_expect -re "$gdb_prompt $"
 gdb_test continue \
-"Continuing\\..*write 1:.*OK.*test_write \\(\\) at.*$srcfile:140.*" \
+"Continuing\\..*write 1:.*OK$stop_msg" \
 "Writing to a file"
 
-send_gdb "tbreak 145\n" ; gdb_expect -re "$gdb_prompt $"
 gdb_test continue \
-"Continuing\\..*write 2:.*EBADF.*test_write \\(\\) at.*$srcfile:145.*" \
+"Continuing\\..*write 2:.*EBADF$stop_msg" \
 "Write using invalid file descriptor returns EBADF"
 
-send_gdb "tbreak 156\n" ; gdb_expect -re "$gdb_prompt $"
 gdb_test continue \
-"Continuing\\..*write 3:.*EBADF.*test_write \\(\\) at.*$srcfile:156.*" \
+"Continuing\\..*write 3:.*EBADF$stop_msg" \
 "Writing to a read-only file returns EBADF"
 
-send_gdb "tbreak 182\n" ; gdb_expect -re "$gdb_prompt $"
 gdb_test continue \
-"Continuing\\..*read 1:.*OK.*test_read \\(\\) at.*$srcfile:182.*" \
+"Continuing\\..*read 1:.*OK$stop_msg" \
 "Reading from a file"
 
-send_gdb "tbreak 186\n" ; gdb_expect -re "$gdb_prompt $"
 gdb_test continue \
-"Continuing\\..*read 2:.*EBADF.*test_read \\(\\) at.*$srcfile:186.*" \
+"Continuing\\..*read 2:.*EBADF$stop_msg" \
 "Read using invalid file descriptor returns EBADF"
 
-send_gdb "tbreak 221\n" ; gdb_expect -re "$gdb_prompt $"
 gdb_test continue \
-"Continuing\\..*lseek 1:.*OK.*lseek 2:.*OK.*lseek 3:.*OK.*test_lseek \\(\\) at.*$srcfile:221.*" \
-"Lseeking a file"
+"Continuing\\..*lseek 1:.*OK$stop_msg" \
+"Lseeking CUR a file"
+
+gdb_test continue \
+"Continuing\\..*lseek 2:.*OK$stop_msg" \
+"Lseeking END a file"
+
+gdb_test continue \
+"Continuing\\..*lseek 3:.*OK$stop_msg" \
+"Lseeking SET a file"
+
 
-send_gdb "tbreak 241\n" ; gdb_expect -re "$gdb_prompt $"
 gdb_test continue \
-"Continuing\\..*close 1:.*OK.*test_close \\(\\) at.*$srcfile:241.*" \
+"Continuing\\..*close 1:.*OK$stop_msg" \
 "Closing a file"
 
-send_gdb "tbreak 245\n" ; gdb_expect -re "$gdb_prompt $"
 gdb_test continue \
-"Continuing\\..*close 2:.*EBADF.*test_close \\(\\) at.*$srcfile:245.*" \
+"Continuing\\..*close 2:.*EBADF$stop_msg" \
 "Closing an invalid file descriptor returns EBADF"
 
-send_gdb "tbreak 262\n" ; gdb_expect -re "$gdb_prompt $"
 gdb_test continue \
-"Continuing\\..*stat 1:.*OK.*test_stat \\(\\) at.*$srcfile:262.*" \
+"Continuing\\..*stat 1:.*OK$stop_msg" \
 "Stat a file"
 
-send_gdb "tbreak 267\n" ; gdb_expect -re "$gdb_prompt $"
 gdb_test continue \
-	"Continuing\\..*stat 2:.*(ENOENT|EFAULT).*test_stat \\(\\) at.*$srcfile:267.*" \
+	"Continuing\\..*stat 2:.*(ENOENT|EFAULT)$stop_msg" \
 "Stat a NULL pathname returns ENOENT or EFAULT"
 
-send_gdb "tbreak 272\n" ; gdb_expect -re "$gdb_prompt $"
 gdb_test continue \
-"Continuing\\..*stat 3:.*ENOENT.*test_stat \\(\\) at.*$srcfile:272.*" \
+"Continuing\\..*stat 3:.*ENOENT$stop_msg" \
 "Stat an empty pathname returns ENOENT"
 
-send_gdb "tbreak 276\n" ; gdb_expect -re "$gdb_prompt $"
 gdb_test continue \
-"Continuing\\..*stat 4:.*ENOENT.*test_stat \\(\\) at.*$srcfile:276.*" \
+"Continuing\\..*stat 4:.*ENOENT$stop_msg" \
 "Stat a nonexistant file returns ENOENT"
 
-send_gdb "tbreak 301\n" ; gdb_expect -re "$gdb_prompt $"
 gdb_test continue \
-"Continuing\\..*fstat 1:.*OK.*test_fstat \\(\\) at.*$srcfile:301.*" \
+"Continuing\\..*fstat 1:.*OK$stop_msg" \
 "Fstat an open file"
 
-send_gdb "tbreak 305\n" ; gdb_expect -re "$gdb_prompt $"
 gdb_test continue \
-"Continuing\\..*fstat 2:.*EBADF.*test_fstat \\(\\) at.*$srcfile:305.*" \
+"Continuing\\..*fstat 2:.*EBADF$stop_msg" \
 "Fstat an invalid file descriptor returns EBADF"
 
-send_gdb "tbreak 314\n" ; gdb_expect -re "$gdb_prompt $"
 gdb_test continue \
-"Continuing\\..*isatty 1:.*OK.*test_isatty \\(\\) at.*$srcfile:314.*" \
+"Continuing\\..*isatty 1:.*OK$stop_msg" \
 "Isatty (stdin)"
 
-send_gdb "tbreak 315\n" ; gdb_expect -re "$gdb_prompt $"
 gdb_test continue \
-"Continuing\\..*isatty 2:.*OK.*test_isatty \\(\\) at.*$srcfile:315.*" \
+"Continuing\\..*isatty 2:.*OK$stop_msg" \
 "Isatty (stdout)"
 
-send_gdb "tbreak 317\n" ; gdb_expect -re "$gdb_prompt $"
 gdb_test continue \
-"Continuing\\..*isatty 3:.*OK.*test_isatty \\(\\) at.*$srcfile:317.*" \
+"Continuing\\..*isatty 3:.*OK$stop_msg" \
 "Isatty (stderr)"
 
-send_gdb "tbreak 319\n" ; gdb_expect -re "$gdb_prompt $"
 gdb_test continue \
-"Continuing\\..*isatty 4:.*OK.*test_isatty \\(\\) at.*$srcfile:319.*" \
+"Continuing\\..*isatty 4:.*OK$stop_msg" \
 "Isatty (invalid fd)"
 
-send_gdb "tbreak 327\n" ; gdb_expect -re "$gdb_prompt $"
 gdb_test continue \
-"Continuing\\..*isatty 5:.*OK.*test_isatty \\(\\) at.*$srcfile:327.*" \
+"Continuing\\..*isatty 5:.*OK$stop_msg" \
 "Isatty (open file)"
 
 send_gdb "set remote system-call-allowed 1\n"; gdb_expect -re ".*$gdb_prompt $"
-send_gdb "tbreak 347\n" ; gdb_expect -re "$gdb_prompt $"
 gdb_test continue \
-"Continuing\\..*system 1:.*OK.*test_system \\(\\) at.*$srcfile:347.*" \
+"Continuing\\..*system 1:.*OK$stop_msg" \
 "System(3) call"
 
 # Is this ok?  POSIX says system returns a waitpid status?
-send_gdb "tbreak 349\n" ; gdb_expect -re "$gdb_prompt $"
 gdb_test continue \
-"Continuing\\..*system 2:.*OK.*test_system \\(\\) at.*$srcfile:349.*" \
+"Continuing\\..*system 2:.*OK$stop_msg" \
 "System with invalid command returns 127"
 
-send_gdb "tbreak 378\n" ; gdb_expect -re "$gdb_prompt $"
 gdb_test continue \
-"Continuing\\..*rename 1:.*OK.*test_rename \\(\\) at.*$srcfile:378.*" \
+"Continuing\\..*rename 1:.*OK$stop_msg" \
 "Rename a file"
 
-send_gdb "tbreak 383\n" ; gdb_expect -re "$gdb_prompt $"
 gdb_test continue \
-"Continuing\\..*rename 2:.*EISDIR.*test_rename \\(\\) at.*$srcfile:383.*" \
+"Continuing\\..*rename 2:.*EISDIR$stop_msg" \
 "Renaming a file to existing directory returns EISDIR"
 
-send_gdb "tbreak 388\n" ; gdb_expect -re "$gdb_prompt $"
 set test "Renaming a directory to a non-empty directory returns ENOTEMPTY or EEXIST"
 gdb_test_multiple continue "${test}" {
-    -re "Continuing\\..*rename 3:.*(ENOTEMPTY|EEXIST).*test_rename \\(\\) at.*$srcfile:388.*$gdb_prompt $" {
+    -re "Continuing\\..*rename 3:.*(ENOTEMPTY|EEXIST)$stop_msg$gdb_prompt $" {
 	pass "${test}"
     }
-    -re "Continuing\\..*rename 3:.*EBUSY.*test_rename \\(\\) at.*$srcfile:388.*$gdb_prompt $" {
+    -re "Continuing\\..*rename 3:.*EBUSY$stop_msg$gdb_prompt $" {
 	# At least version <= 2.6/2004-01-08 of the Linux Kernel gets
 	# this wrong (reporting EBUSY) when the file system is NFS
 	# mounted.
@@ -230,45 +212,38 @@ gdb_test_multiple continue "${test}" {
     }
 }
 
-send_gdb "tbreak 393\n" ; gdb_expect -re "$gdb_prompt $"
 gdb_test continue \
-"Continuing\\..*rename 4:.*EINVAL.*test_rename \\(\\) at.*$srcfile:393.*" \
+"Continuing\\..*rename 4:.*EINVAL$stop_msg" \
 "Renaming a directory to a subdir of itself returns EINVAL"
 
-send_gdb "tbreak 397\n" ; gdb_expect -re "$gdb_prompt $"
 gdb_test continue \
-"Continuing\\..*rename 5:.*ENOENT.*test_rename \\(\\) at.*$srcfile:397.*" \
+"Continuing\\..*rename 5:.*ENOENT$stop_msg" \
 "Renaming a nonexistant file returns ENOENT"
 
-send_gdb "tbreak 412\n" ; gdb_expect -re "$gdb_prompt $"
 gdb_test continue \
-"Continuing\\..*unlink 1:.*OK.*test_unlink \\(\\) at.*$srcfile:412.*" \
+"Continuing\\..*unlink 1:.*OK$stop_msg" \
 "Unlink a file"
 
-send_gdb "tbreak 432\n" ; gdb_expect -re "$gdb_prompt $"
 # This test fails on Cygwin because unlink() succeeds on Win32 systems
 # in that situation.
 if [ishost *cygwin*] {
     setup_xfail "*-*-*"
 }
 gdb_test continue \
-"Continuing\\..*unlink 2:.*EACCES.*test_unlink \\(\\) at.*$srcfile:432.*" \
+"Continuing\\..*unlink 2:.*EACCES$stop_msg" \
 "Unlinking a file in a directory w/o write access returns EACCES"
 
-send_gdb "tbreak 436\n" ; gdb_expect -re "$gdb_prompt $"
 gdb_test continue \
-"Continuing\\..*unlink 3:.*ENOENT.*test_unlink \\(\\) at.*$srcfile:436.*" \
+"Continuing\\..*unlink 3:.*ENOENT$stop_msg" \
 "Unlinking a nonexistant file returns ENOENT"
 
-send_gdb "tbreak 446\n" ; gdb_expect -re "$gdb_prompt $"
 gdb_test continue \
-"Continuing\\..*time 1:.*OK.*test_time \\(\\) at.*$srcfile:446.*" \
+"Continuing\\..*time 1:.*OK$stop_msg" \
 "Time(2) call returns the same value as in parameter"
 
 sleep 2
-send_gdb "tbreak 450\n" ; gdb_expect -re "$gdb_prompt $"
 gdb_test continue \
-"Continuing\\..*time 2:.*OK.*test_time \\(\\) at.*$srcfile:450.*" \
+"Continuing\\..*time 2:.*OK$stop_msg" \
 "Time(2) returns feasible values"
 
 send_gdb "quit\n"