Merge GDB 7.5.1

gdb/testsuite/gdb.base/foll-exec.exp

 #   Copyright 1997, 1999, 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 { [is_remote target] || ![isnative] } then {
     continue
 }
 
+# Until "catch exec" is implemented on other targets...
+#
+if {![istarget "hppa*-hp-hpux*"] && ![istarget "*-linux*"]} then {
+    continue
+}
 
 set testfile "foll-exec"
 set testfile2 "execd-prog"
 set srcfile ${testfile}.c
 set srcfile2 ${testfile2}.c
 set binfile ${objdir}/${subdir}/${testfile}
 set binfile2 ${objdir}/${subdir}/${testfile2}
 
 # build the first test case
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable {debug}] != "" } {
      untested foll-exec.exp
      return -1
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
      untested foll-exec.exp
      return -1
 }
 
-
-# Until "catch exec" is implemented on other targets...
-#
-if {![istarget "hppa*-hp-hpux*"] && ![istarget "*-linux*"]} then {
-    continue
-}
-
 proc zap_session {} {
    global gdb_prompt
    global binfile
 
    send_gdb "kill\n"
    gdb_expect {
      -re ".*Kill the program being debugged.*y or n. $" {
        gdb_test_no_output "y" ""
        send_gdb "file $binfile\n"
        gdb_expect {
@@ skipping 350 matching lines @@
 gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${binfile}
 
 
 # This is a test of gdb's ability to follow a process through a
 # Unix exec() system call.
 #
 do_exec_tests
 
 return 0