2013-04-24 Muhammad Bilal <mbilal@codesourcery.com>

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.base / fileio.exp

diff --git a/gdb/testsuite/gdb.base/fileio.exp b/gdb/testsuite/gdb.base/fileio.exp
index 3255afc986a69f82ec781304738cea9048ddcbd8..c93913e9681bdcaf8a4daea970813c5e6ed1649a 100644 (file)
--- a/gdb/testsuite/gdb.base/fileio.exp
+++ b/gdb/testsuite/gdb.base/fileio.exp
@@ -1,4 +1,4 @@
-#   Copyright 2002, 2003, 2004, 2007, 2008 Free Software Foundation, Inc.
+#   Copyright 2002-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
@@ -20,12 +20,6 @@ if [target_info exists gdb,nofileio] {
     continue
 }
 
-if $tracelevel then {
-        strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
 
 set testfile "fileio"
 set srcfile ${testfile}.c
@@ -39,8 +33,8 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
 # Create and source the file that provides information about the compiler
 # used to compile the test case.
 
-if [get_compiler_info ${binfile}] {
-    return -1;
+if [get_compiler_info] {
+    return -1
 }
 
 remote_exec build {sh -xc test\ -r\ dir2.fileio.test\ &&\ chmod\ -f\ +w\ dir2.fileio.test}
@@ -55,17 +49,17 @@ gdb_exit
 gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${binfile}
-send_gdb "set print sevenbit-strings\n" ; gdb_expect -re "$gdb_prompt $"
-send_gdb "set print address off\n" ; gdb_expect -re "$gdb_prompt $"
-send_gdb "set width 0\n" ; gdb_expect -re "$gdb_prompt $"
-
+gdb_test_no_output "set print sevenbit-strings"
+gdb_test_no_output "set print address off"
+gdb_test_no_output "set width 0"
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
     continue
 }
 
-send_gdb "break stop\n" ; gdb_expect -re "Breakpoint .*$srcfile.*$gdb_prompt $"
+gdb_test "break stop" "Breakpoint .*$srcfile.*" 
+
 set stop_msg ".*Breakpoint .* stop \\(\\) at.*$srcfile:.*static void stop \\(\\) {}.*"
 
 gdb_test continue \
@@ -84,7 +78,8 @@ gdb_test continue \
 "Continuing\\..*open 4:.*ENOENT$stop_msg" \
 "Opening nonexistant file returns ENOENT"
 
-send_gdb "continue\n" ; gdb_expect -re "$gdb_prompt $"
+gdb_test "continue" ".*" ""
+
 catch "system \"chmod -f -w nowrt.fileio.test\""
 
 gdb_test continue \
@@ -180,7 +175,8 @@ gdb_test continue \
 "Continuing\\..*system 1:.*OK$stop_msg" \
 "System says shell is available"
 
-send_gdb "set remote system-call-allowed 1\n"; gdb_expect -re ".*$gdb_prompt $"
+gdb_test_no_output "set remote system-call-allowed 1"
+
 gdb_test continue \
 "Continuing\\..*system 2:.*OK$stop_msg" \
 "System(3) call"
@@ -246,8 +242,9 @@ gdb_test continue \
 "Continuing\\..*time 2:.*OK$stop_msg" \
 "Time(2) returns feasible values"
 
-send_gdb "quit\n"
-send_gdb "y\n"
+gdb_exit
+# Wait till GDB really exits.
+sleep 1
 
 remote_exec build {sh -xc test\ -r\ dir2.fileio.test\ &&\ chmod\ -f\ +w\ dir2.fileio.test}
 remote_exec build {sh -xc rm\ -rf\ *.fileio.test}