Fix racy test in gdb.base/new-ui.exp

I noticed gdb.base/new-ui.exp failing once here with:

 FAIL: gdb.base/new-ui.exp: do_test: delete all breakpoints on extra console (got interactive prompt)
 FAIL: gdb.base/new-ui.exp: do_test: main console: next causes no spurious output on other console
 FAIL: gdb.base/new-ui.exp: do_test: main console: breakpoint hit reported on other console

The problem is 100% reproducible with check-read1:
  $ make check-read1 TESTS="gdb.*/new-ui.exp"

testsuite/gdb.log shows:
  delete
  Delete all breakpoints? (y or n) [answered Y; input not from terminal]
  (gdb) FAIL: gdb.base/new-ui.exp: do_test: delete all breakpoints on extra console (got interactive prompt)

This commit fixes the problem.

gdb/testsuite/ChangeLog:
2017-10-24  Pedro Alves  <palves@redhat.com>

	* gdb.base/new-ui.exp (do_test): Split "delete all breakpoints on
	extra console" test in two stages.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index d9ed6876a9e62b3ac33968d525f732860bc53e61..0c6c93acb031c74ff57e2ac1ddc598f9d46644ff 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-10-24  Pedro Alves  <palves@redhat.com>
+
+       * gdb.base/new-ui.exp (do_test): Split "delete all breakpoints on
+       extra console" test in two stages.
+
 2017-10-24  Pedro Alves  <palves@redhat.com>
 
        * gdb.threads/attach-into-signal.exp (corefunc): Reindent.

diff --git a/gdb/testsuite/gdb.base/new-ui.exp b/gdb/testsuite/gdb.base/new-ui.exp
index b84f4de712c3a99db55e3e62a7a1eae3d596977a..f9a1851a543543dcccceface3dbb1be7d57b6231 100644 (file)
--- a/gdb/testsuite/gdb.base/new-ui.exp
+++ b/gdb/testsuite/gdb.base/new-ui.exp
@@ -135,9 +135,18 @@ proc_with_prefix do_test {} {
                 "Delete all breakpoints. .y or n. $" "n"
     }
     with_spawn_id $extra_spawn_id {
-       gdb_test "delete" \
-                "Delete all breakpoints. .y or n. .answered Y; input not from terminal." \
-                "delete all breakpoints on extra console"
+       # Check output in two stages in order to override
+       # gdb_test_multiple's internal "got interactive prompt" fail
+       # that would otherwise match if the expect buffer happens to
+       # fill with partial output that ends in "(y or n) ".
+       set test "delete all breakpoints on extra console"
+       gdb_test_multiple "delete" $test {
+           -re "Delete all breakpoints. .y or n. " {
+               gdb_test "" \
+                   ".answered Y; input not from terminal." \
+                   $test
+           }
+       }
     }
 
     # Run a few execution tests with the main console as the driver