Fixup broken tests in existing patches

Related: RHEL-33256

gdb-6.3-attach-see-vdso-test.patch

@@ -40,7 +40,7 @@ diff --git a/gdb/testsuite/gdb.base/attach-see-vdso.exp b/gdb/testsuite/gdb.base
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.base/attach-see-vdso.exp
-@@ -0,0 +1,77 @@
+@@ -0,0 +1,74 @@
 +# Copyright 2007
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -64,10 +64,7 @@ new file mode 100644
 +    return 0
 +}
 +
-+if {[use_gdb_stub]} {
++require !use_gdb_stub
-+    untested "skipping test because of use_gdb_stub"
-+    return -1
-+}
 +
 +set testfile "attach-see-vdso"
 +set srcfile  ${testfile}.c

gdb-6.5-bz218379-ppc-solib-trampoline-test.patch

@@ -45,7 +45,7 @@ diff --git a/gdb/testsuite/gdb.base/step-over-trampoline.exp b/gdb/testsuite/gdb
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.base/step-over-trampoline.exp
-@@ -0,0 +1,59 @@
+@@ -0,0 +1,56 @@
 +# Copyright 2006 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -62,10 +62,7 @@ new file mode 100644
 +# along with this program; if not, write to the Free Software
 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 +
-+if {[use_gdb_stub]} {
++require !use_gdb_stub
-+    untested "skipping test because of use_gdb_stub"
-+    return -1
-+}
 +
 +if $tracelevel then {
 +    strace $tracelevel

gdb-6.5-bz243845-stale-testing-zombie-test.patch

@@ -10,7 +10,7 @@ diff --git a/gdb/testsuite/gdb.base/tracefork-zombie.exp b/gdb/testsuite/gdb.bas
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.base/tracefork-zombie.exp
-@@ -0,0 +1,76 @@
+@@ -0,0 +1,73 @@
 +# Copyright 2007 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -28,10 +28,7 @@ new file mode 100644
 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 +
 +# are we on a target board
-+if {[use_gdb_stub]} {
++require !use_gdb_stub
-+    untested "skipping test because of use_gdb_stub"
-+    return -1
-+}
 +
 +# Start the program running and then wait for a bit, to be sure
 +# that it can be attached to.

gdb-6.5-gcore-buffer-limit-test.patch

@@ -52,7 +52,7 @@ diff --git a/gdb/testsuite/gdb.base/gcore-excessive-memory.exp b/gdb/testsuite/g
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.base/gcore-excessive-memory.exp
-@@ -0,0 +1,99 @@
+@@ -0,0 +1,96 @@
 +# Copyright 2008 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -69,10 +69,7 @@ new file mode 100644
 +# along with this program; if not, write to the Free Software
 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 +
-+if {[use_gdb_stub]} {
++require !use_gdb_stub
-+    untested "skipping test because of use_gdb_stub"
-+    return -1
-+}
 +
 +set testfile gcore-excessive-memory
 +set srcfile ${testfile}.c

gdb-6.5-section-num-fixup-test.patch

@@ -68,7 +68,7 @@ diff --git a/gdb/testsuite/gdb.base/datalib.exp b/gdb/testsuite/gdb.base/datalib
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.base/datalib.exp
-@@ -0,0 +1,56 @@
+@@ -0,0 +1,53 @@
 +# Copyright 2008 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -85,10 +85,7 @@ new file mode 100644
 +# along with this program; if not, write to the Free Software
 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 +
-+if {[use_gdb_stub]} {
++require !use_gdb_stub
-+    untested "skipping test because of use_gdb_stub"
-+    return -1
-+}
 +
 +set testfile datalib
 +set srcfilemain ${testfile}-main.c

gdb-6.6-buildid-locate-solib-missing-ids.patch

@@ -130,7 +130,7 @@ diff --git a/gdb/testsuite/gdb.base/gcore-buildid-exec-but-not-solib.exp b/gdb/t
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.base/gcore-buildid-exec-but-not-solib.exp
-@@ -0,0 +1,105 @@
+@@ -0,0 +1,103 @@
 +# Copyright 2016 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -146,9 +146,7 @@ new file mode 100644
 +# 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 {[skip_shlib_tests]} {
++require allow_shlib_tests
-+    return 0
-+}
 +
 +set testfile "gcore-buildid-exec-but-not-solib"
 +set srcmainfile ${testfile}-main.c

gdb-bz634108-solib_address.patch

@@ -36,6 +36,6 @@ new file mode 100644
 +gdb_start
 +
 +# Skip all tests if Python scripting is not enabled.
-+if { [skip_python_tests] } { continue }
++require allow_python_tests
 +
 +gdb_test "python print (gdb.solib_name(-1))" "None" "gdb.solib_name exists"

gdb-glibc-strstr-workaround.patch

@@ -10,7 +10,7 @@ diff --git a/gdb/testsuite/gdb.base/gnu-ifunc-strstr-workaround.exp b/gdb/testsu
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.base/gnu-ifunc-strstr-workaround.exp
-@@ -0,0 +1,119 @@
+@@ -0,0 +1,117 @@
 +# Copyright (C) 2012 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -30,9 +30,7 @@ new file mode 100644
 +# invalid IFUNC DW_AT_linkage_name: memmove strstr time
 +# http://sourceware.org/bugzilla/show_bug.cgi?id=14166
 +
-+if {[skip_shlib_tests]} {
++require allow_shlib_tests
-+    return 0
-+}
 +
 +set testfile "gnu-ifunc-strstr-workaround"
 +set executable ${testfile}

gdb-rhbz1007614-memleak-infpy_read_memory-test.patch

@@ -88,7 +88,7 @@ new file mode 100644
 +    return -1
 +}
 +
-+if { [skip_python_tests] } { continue }
++require allow_python_tests
 +
 +set pid_of_gdb [exp_pid -i [board_info host fileid]]
 +

gdb-rhbz1156192-recursive-dlopen-test.patch

@@ -211,7 +211,7 @@ diff --git a/gdb/testsuite/gdb.base/gdb-rhbz1156192-recursive-dlopen.exp b/gdb/t
 new file mode 100644
 --- /dev/null
 +++ b/gdb/testsuite/gdb.base/gdb-rhbz1156192-recursive-dlopen.exp
-@@ -0,0 +1,157 @@
+@@ -0,0 +1,152 @@
 +# Copyright 2014 Free Software Foundation, Inc.
 +#
 +# This program is free software; you can redistribute it and/or modify
@@ -227,13 +227,8 @@ new file mode 100644
 +# 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 {[skip_shlib_tests]} {
++require allow_shlib_tests
-+    untested "skipping shlib tests"
++require !use_gdb_stub
-+    return 0
-+} elseif {[use_gdb_stub]} {
-+    untested "skipping tests because of stub"
-+    return 0
-+}
 +
 +# Library foo
 +set libname1 "gdb-rhbz1156192-recursive-dlopen-libfoo"

gdb-rhel-13298-inferior-funcall-bp-condition-4-of-5.patch

@@ -351,7 +351,7 @@ diff --git a/gdb/testsuite/gdb.threads/infcall-from-bp-cond-timeout.exp b/gdb/te
 +		 "GDB has restored the context to what it was before the call\\." \
 +		 "To change this behavior use \"set unwind-on-timeout off\"\\." \
 +		 "Evaluation of the expression containing the function" \
-+		 "\\(condition_func\\) will be abandoned\\." \
++		 "\\(condition_func\\) will be abandoned\\.(\r\n\\\[New Thread \[^\r\n\]+\\\])*" \
 +		 "" \
 +		 "Thread ${::decimal}\[^\r\n\]*hit Breakpoint ${bp_num}, \[^\r\n\]+" \
 +		 "\[^\r\n\]+ Conditional breakpoint here\\. \[^\r\n\]+"] \