Merge GDB 7.5.1

gdb/testsuite/gdb.threads/attach-stopped.exp

 # Copyright 2008-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/>.
 
 # This test was created by modifying attach.exp.
 # This file was created by Jeff Johnston <jjohnstn@redhat.com>.
 # This file was updated by Jan Kratochvil <jan.kratochvil@redhat.com>.
 
 # This test only works on Linux
 if { ![isnative] || [is_remote host] || [target_info exists use_gdb_stub]
      || ![istarget *-linux*] } {
     continue
 }
 
-set testfile "attach-stopped"
-set srcfile  ${testfile}.c
-set binfile  ${objdir}/${subdir}/${testfile}
-set escapedbinfile  [string_to_regexp ${objdir}/${subdir}/${testfile}]
+standard_testfile
+set escapedbinfile  [string_to_regexp $binfile]
 
 #execute_anywhere "rm -f ${binfile}"
 remote_exec build "rm -f ${binfile}"
 # For debugging this test
 #
 #log_user 1
 
 proc corefunc { threadtype } {
     global srcfile
     global binfile
     global escapedbinfile
     global srcdir
     global subdir
     global gdb_prompt
 
-    if [get_compiler_info ${binfile}] {
+    if [get_compiler_info] {
         return -1
     }
 
     # Start the program running and then wait for a bit, to be sure
     # that it can be attached to.
 
     set testpid [eval exec $binfile &]
 
     # Avoid some race:
     sleep 2
@@ skipping 15 matching lines @@
             pass "$test"
         }
     }
 
     # ".*sleep.*clone.*" would fail on s390x as bt stops at START_THREAD there.
     if {[string equal $threadtype threaded]} {
         gdb_test "thread apply all bt" ".*sleep.*start_thread.*" "$threadtype: attach2 to stopped bt"
     } else {
         gdb_test "bt" ".*sleep.*main.*" "$threadtype: attach2 to stopped bt"
     }
-    # This breakpoint is there for old/non-x86 kernels not restarting syscalls.
-    gdb_breakpoint $srcfile:[gdb_get_line_number "Second sleep"]
-    set test "$threadtype: attach2 continue"
-    gdb_test_multiple "continue" "continue ($test)" {
-        -re "Continuing" {
-            pass "continue ($test)"
-        }
-    }
-
-    # For this to work we must be sure to consume the "Continuing."
-    # message first, or GDB's signal handler may not be in place.
-    after 1000 {send_gdb "\003"}
-    set test "$threadtype: attach2 stop interrupt"
-    gdb_expect 10 {
-      -re "Program received signal SIGINT.*$gdb_prompt $"
-        {
-          pass $test
-        }
-      -re "Breakpoint \[0-9\].*$srcfile.*$gdb_prompt $"
-        {
-          pass $test
-        }
-      timeout
-        {
-          fail $test
-        }
-    }
 
     gdb_exit
 
     # Avoid some race:
     sleep 2
 
-    # At this point, the process should be sleeping
+    # At this point, the process may be sleeping or T (Stopped) depending on
+    # the Linux kernel version.  The behavior is not tested as it is not
+    # dependent on GDB.
 
-    if [catch {open /proc/${testpid}/status r} fileid2] {
-        set line2 "NOTFOUND"
-    } else {
-        gets $fileid2 line1;
-        gets $fileid2 line2;
-        close $fileid2;
-    }
-
-    set test "$threadtype: attach2, exit leaves process sleeping"
-    if {[string match "*(sleeping)*" $line2]} {
-      pass $test
-    } else {
-      fail $test
-    }
-
-    # Make sure we don't leave a process around to confuse
-    # the next test run (and prevent the compile by keeping
-    # the text file busy), in case the "set should_exit" didn't
-    # work.
-       
     remote_exec build "kill -9 ${testpid}"
 }
 
 # build the test case first without threads
 #
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
     untested "attach-stopped.exp (unthreaded)"
     return -1
 }
 
 corefunc nonthreaded
 
 # build the test case first without threads
 #
 if  { [gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DUSE_THREADS}] != "" } {
     untested "attach-stopped.exp (threaded)"
     return -1
 }
 
 corefunc threaded
 
 return 0