Merge GDB 7.5.1

gdb/testsuite/gdb.base/attach.exp

 # Copyright 1997, 1999, 2002-2004, 2007-2012 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
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-if $tracelevel then {
-    strace $tracelevel
-}
-
 
 # On HP-UX 11.0, this test is causing a process running the program
 # "attach" to be left around spinning.  Until we figure out why, I am
 # commenting out the test to avoid polluting tiamat (our 11.0 nightly
 # test machine) with these processes. RT
 #
 # Setting the magic bit in the target app should work.  I added a
 # "kill", and also a test for the R3 register warning.  JB
 if { [istarget "hppa*-*-hpux*"] } {
     return 0
@@ skipping 24 matching lines @@
     return -1
 }
 
 # Build the in-system-call test
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable {debug}] != "" } {
     untested attach.exp
     return -1
 }
 
-if [get_compiler_info ${binfile}] {
+if [get_compiler_info] {
     return -1
 }
 
 proc do_attach_tests {} {
     global gdb_prompt
     global binfile
     global escapedbinfile
     global srcfile
     global testfile
     global objdir
@@ skipping 81 matching lines @@
             pass "$test"
         }
         -re "Attaching to.*, process .*couldn't open /proc file.*$gdb_prompt $" {
             # Response expected from /proc-based systems.
             pass "$test"
         }
         -re "Can't attach to process..*$gdb_prompt $" {
             # Response expected on Cygwin
             pass "$test"
         }
+        -re "Attaching to.*, process $boguspid.*failed.*$gdb_prompt $" {
+            # Response expected on the extended-remote target.
+            pass "$test"
+        }
     }
     
     # Verify that we can attach to the process by first giving its
     # executable name via the file command, and using attach with the
     # process ID.
 
     # (Actually, the test system appears to do this automatically for
     # us.  So, we must also be prepared to be asked if we want to
     # discard an existing set of symbols.)
     
@@ skipping 44 matching lines @@
     gdb_test_multiple "file" "$test" {
         -re "No executable file now.*Discard symbol table.*y or n. $" {
             gdb_test "y" "No symbol file now." "$test"
         }
     }
     set timeout $old_timeout
 
     # Verify that we can attach to the process just by giving the
     # process ID.
    
-    set test "set file, before attach2"
+    set test "attach2, with no file"
+    set found_exec_file 0
     gdb_test_multiple "attach $testpid" "$test" {
         -re "Attaching to process $testpid.*Load new symbol table from \"$escapedbinfile\.exe\".*y or n. $" {
             # On Cygwin, the DLL's symbol tables are loaded prior to the
             # executable's symbol table.  This in turn always results in
             # asking the user for actually loading the symbol table of the
             # executable.
             gdb_test "y" "Reading symbols from $escapedbinfile\.\.\.*done." \
                 "$test (reset file)"
+
+            set found_exec_file 1
         }
         -re "Attaching to process $testpid.*Reading symbols from $escapedbinfile.*main.*at .*$gdb_prompt $" {
             pass "$test"
+            set found_exec_file 1
         }
     }
 
+    if {$found_exec_file == 0} {
+        set test "load file manually, after attach2"
+        gdb_test_multiple "file $binfile" "$test" {
+            -re "A program is being debugged already..*Are you sure you want to change the file.*y or n. $" {
+                gdb_test "y" "Reading symbols from $escapedbinfile\.\.\.*done." \
+                    "$test (re-read)"
+            }
+            -re "Reading symbols from $escapedbinfile\.\.\.*done.*$gdb_prompt $" {
+                pass "$test"
+            }
+        }
+    }
+
     # Verify that we can modify the variable "should_exit" in the
     # program.
 
     gdb_test_no_output "set should_exit=1" "after attach2, set should_exit"
 
     # Verify that the modification really happened.
 
     gdb_test "tbreak 19" "Temporary breakpoint .*at.*$srcfile, line 19.*" \
         "after attach2, set tbreak postloop"
 
@@ skipping 130 matching lines @@
 
 # Test attaching when the target is inside a system call
 
 gdb_exit
 gdb_start
 
 gdb_reinitialize_dir $srcdir/$subdir
 do_call_attach_tests
 
 return 0