[gdb/testsuite] Fix some test-cases for check-read1 (gdb_test_lines)

I ran the testsuite in an environment simulating a stressed system in
combination with check-read1.  This exposes a few more FAILs.

Fix some by using gdb_test_lines, as well as related gdb_get_lines.

Tested on x86_64-linux.

2 files changed, 19 insertions, 15 deletions

diff --git a/gdb/testsuite/gdb.server/bkpt-other-inferior.exp b/gdb/testsuite/gdb.server/bkpt-other-inferior.exp
index 78d1ae02..46c07d1 100644
--- a/gdb/testsuite/gdb.server/bkpt-other-inferior.exp
+++ b/gdb/testsuite/gdb.server/bkpt-other-inferior.exp
@@ -77,19 +77,23 @@ foreach inf_sel {1 2} {
 
 	gdb_test_no_output "set debug remote 1"
 
-	gdb_test_multiple "break -q main" "set breakpoint" {
-	    -re "Sending packet: \\\$qXfer:auxv:read.*$gdb_prompt $" {
-		# Symbol lookup may access the target to read AUXV in
-		# order to determine the debug base for SVR4 linker
-		# namespaces.
-		xfail "$gdb_test_name"
-	    }
-	    -re "Sending packet.*$gdb_prompt $" {
-		fail "$gdb_test_name"
-	    }
-	    -re "^break -q main\r\nBreakpoint .* at .*$gdb_prompt $" {
-		pass "$gdb_test_name"
-	    }
+	set lines [gdb_get_lines "break -q main"]
+
+	set test "set breakpoint"
+	set re_xfail \
+	    [string_to_regexp {Sending packet: $qXfer:auxv:read}]
+	if { [regexp $re_xfail $lines] } {
+	    # Symbol lookup may access the target to read AUXV in
+	    # order to determine the debug base for SVR4 linker
+	    # namespaces.
+	    xfail $test
+	} elseif { [regexp "Sending packet:" $lines] } {
+	    fail $test
+	} else {
+	    set re \
+		"Breakpoint $decimal at $hex: \[^\r\n\]+"
+	    set re "^$re\r\n$"
+	    gdb_assert { [regexp $re $lines] } $test
 	}
 
 	gdb_test_no_output "set debug remote 0"
diff --git a/gdb/testsuite/gdb.server/ext-run.exp b/gdb/testsuite/gdb.server/ext-run.exp
index 6f7b5bd..296af98 100644
--- a/gdb/testsuite/gdb.server/ext-run.exp
+++ b/gdb/testsuite/gdb.server/ext-run.exp
@@ -58,8 +58,8 @@ if { [istarget *-*-linux*] } {
     if { $do_xml_test } {
 	# This is done in a way to avoid the timeout that can occur from
 	# applying .* regexp to large output.
-	gdb_test_sequence "info os processes" "get process list" \
-	    { "pid +user +command" "1 +root +\[/a-z\]*(init|systemd|bash)" }
+	gdb_test_lines "info os processes" "get process list" \
+	    "^pid +user +command.*\r\n1 +root +\[/a-z\]*(init|systemd|bash)"
     }
 }