From b2b2a2159876fa8db57ce017b949cafc6f1a32df Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Wed, 3 Jul 2019 16:57:48 +0100 Subject: [PATCH] Fix test_gdb_complete_tab_multiple race Running 'make check-read1 TESTS="gdb.base/options.exp"' revealed a race in test_gdb_complete_tab_multiple. There's a gdb_test_multiple call that expects a prompt in the middle of the regexp. That's racy because gdb_test_multiple includes a built-in FAIL pattern for the prompt, which may match if gdb is slow enough to produce the rest of the output after the prompt. Fix this in the usual way of splitting the matching in two. gdb/testsuite/ChangeLog: 2019-07-03 Pedro Alves * lib/completion-support.exp (test_gdb_complete_tab_multiple): Split one gdb_test_multiple call in two to avoid a race. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/lib/completion-support.exp | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 9b988dcfcc..6e2234984d 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-07-03 Pedro Alves + + * lib/completion-support.exp (test_gdb_complete_tab_multiple): + Split one gdb_test_multiple call in two to avoid a race. + 2019-07-03 Pedro Alves * gdb.base/with.c: New file. diff --git a/gdb/testsuite/lib/completion-support.exp b/gdb/testsuite/lib/completion-support.exp index 97fed18b05..3199e85fd4 100644 --- a/gdb/testsuite/lib/completion-support.exp +++ b/gdb/testsuite/lib/completion-support.exp @@ -151,8 +151,12 @@ proc test_gdb_complete_tab_multiple { input_line add_completed_line \ set maybe_bell "" } gdb_test_multiple "" "$test (second tab)" { - -re "^${maybe_bell}\r\n$expected_re\r\n$gdb_prompt $input_line_re$add_completed_line_re$" { - pass "$test" + -re "^${maybe_bell}\r\n$expected_re\r\n$gdb_prompt " { + gdb_test_multiple "" "$test (second tab)" { + -re "^$input_line_re$add_completed_line_re$" { + pass "$test" + } + } } } } -- 2.34.1