From 09df4675f2e4f8f098954f9a38f44d12089f1c4e Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Mon, 30 Nov 2015 16:05:19 +0000 Subject: [PATCH] Make dprintf-non-stop.exp cope with remote testing Testing with the extended-remote board with "maint set target-non-stop on" shows a dprintf-non-stop.exp regression. The issue is simply that the test is expecting output that is only valid for the native target: native: [process 8676] #1 stopped. remote: [Thread 8900.8900] #1 stopped. In order to expose this without "maint set target-non-stop on", this restarts gdb with non-stop mode already enabled. gdb/testsuite/ChangeLog: 2015-11-30 Pedro Alves * gdb.base/dprintf-non-stop.exp: Use build_executable instead of prepare_for_testing. Start gdb with "set non-stop on" appended to GDBFLAGS. Lax expected stop output. --- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.base/dprintf-non-stop.exp | 10 +++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 2fddb7c..02a9a07 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2015-11-30 Pedro Alves + + * gdb.base/dprintf-non-stop.exp: Use build_executable instead of + prepare_for_testing. Start gdb with "set non-stop on" appended to + GDBFLAGS. Lax expected stop output. + 2015-11-27 Yao Qi * gdb.arch/arm-neon.exp: New. diff --git a/gdb/testsuite/gdb.base/dprintf-non-stop.exp b/gdb/testsuite/gdb.base/dprintf-non-stop.exp index 4e3e5bc..5b878aa 100644 --- a/gdb/testsuite/gdb.base/dprintf-non-stop.exp +++ b/gdb/testsuite/gdb.base/dprintf-non-stop.exp @@ -20,13 +20,17 @@ if [is_remote target] then { } standard_testfile +set executable ${testfile} -if [prepare_for_testing "failed to prepare for dprintf with non-stop" \ +if [build_executable "failed to prepare for dprintf with non-stop" \ ${testfile} ${srcfile} {debug}] { return -1 } -gdb_test_no_output "set non-stop on" +save_vars { GDBFLAGS } { + append GDBFLAGS " -ex \"set non-stop on\"" + clean_restart ${executable} +} if ![runto main] { fail "Can't run to main" @@ -60,7 +64,7 @@ gdb_test_multiple $test $test { set test "inferior stopped" gdb_test_multiple "" $test { - -re "\r\n\\\[.* \[0-9\]+\\\] #1 stopped\\\.\r\n" { + -re "\r\n\\\[.*\\\] #1 stopped\\\.\r\n" { pass $test } } -- 2.7.4