From patchwork Tue Apr 21 18:08:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Alves X-Patchwork-Id: 6362 Received: (qmail 95459 invoked by alias); 21 Apr 2015 18:08:53 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 95100 invoked by uid 89); 21 Apr 2015 18:08:51 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00, SPF_HELO_PASS, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Tue, 21 Apr 2015 18:08:49 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t3LI8loj026439 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 21 Apr 2015 14:08:48 -0400 Received: from brno.lan (ovpn01.gateway.prod.ext.ams2.redhat.com [10.39.146.11]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t3LI8WL3028722 for ; Tue, 21 Apr 2015 14:08:47 -0400 From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PATCH 14/24] Make gdb.base/call-rt-st.exp use $inferior_spawn_id Date: Tue, 21 Apr 2015 19:08:21 +0100 Message-Id: <1429639711-16459-15-git-send-email-palves@redhat.com> In-Reply-To: <1429639711-16459-1-git-send-email-palves@redhat.com> References: <1429639711-16459-1-git-send-email-palves@redhat.com> gdb/testsuite/ChangeLog: 2015-04-21 Pedro Alves * gdb.base/call-rt-st.exp (print_struct_call): Split "result" parameter into two new parameters, "inf_result" and "gdb_result". Expect inferior output and gdb output from $inferior_spawn_id and $gdb_spawn_id, respectively. Adjust all callers. --- gdb/testsuite/gdb.base/call-rt-st.exp | 61 ++++++++++++++++++++++++++--------- 1 file changed, 46 insertions(+), 15 deletions(-) diff --git a/gdb/testsuite/gdb.base/call-rt-st.exp b/gdb/testsuite/gdb.base/call-rt-st.exp index 36d81fb..46cdfa9 100644 --- a/gdb/testsuite/gdb.base/call-rt-st.exp +++ b/gdb/testsuite/gdb.base/call-rt-st.exp @@ -87,76 +87,107 @@ gdb_test_multiple "finish" "finish out from loop count" { # return value unknown", call that an `unsupported' test; on some # architectures, it's impossible to find structs returned by value # reliably. -proc print_struct_call { expr result } { +proc print_struct_call { expr inf_result gdb_result } { global gdb_prompt + global inferior_spawn_id gdb_spawn_id + + set inferior_matched 0 + set gdb_matched 0 set command "print $expr" gdb_test_multiple "${command}" "${command}" { - -re "$result\[\r\n\]+$gdb_prompt $" { - pass "$command" - } + -i $inferior_spawn_id + -re "$inf_result" { + set inferior_matched 1 + if {!$gdb_matched} { + exp_continue + } + } + + -i $gdb_spawn_id + -re "$gdb_result\r\n$gdb_prompt $" { + set gdb_matched 1 + if {!$inferior_matched} { + exp_continue + } + } -re "Function return value unknown.\[\r\n\]+$gdb_prompt $" { unsupported "$command" + return } } + + verbose -log "inferior_matched=$inferior_matched, gdb_matched=$gdb_matched" + gdb_assert {$inferior_matched && $gdb_matched} $command } if ![gdb_skip_stdio_test "print print_struct_rep(*struct1)"] { print_struct_call "print_struct_rep(*struct1)" \ - ".*Contents of struct1:\[ \t\n\r\]+22\[ \t\]+0\[ \t\n\r\]+.\[0-9\]+ = \\{value = 5, head = 0\\}" + ".*Contents of struct1:\[ \t\n\r\]+22\[ \t\]+0\[ \t\n\r\]+" \ + ".\[0-9\]+ = \\{value = 5, head = 0\\}" } if ![gdb_skip_stdio_test "print print_one_large_struct(...)"] { print_struct_call "print_one_large_struct(*list1)" \ - ".*\[ \t\]+4\[ \t\]+1\[ \r\n\]+.\[0-9\]+ = \\{next_index = \\{1, 2, 3, 4, 5, 6, 7, 8, 9, 10\\}, values = \\{4, 6, 8, 10, 12, 14, 16, 18, 20, 22\\}, head = 0\\}" + ".*\[ \t\]+4\[ \t\]+1\[ \r\n\]+" \ + ".\[0-9\]+ = \\{next_index = \\{1, 2, 3, 4, 5, 6, 7, 8, 9, 10\\}, values = \\{4, 6, 8, 10, 12, 14, 16, 18, 20, 22\\}, head = 0\\}" } if {![gdb_skip_float_test "print print_one_double(*d1)"] && \ ![gdb_skip_stdio_test "print print_one_double(*d1)"] } { print_struct_call "print_one_double(*d1)" \ - ".*Contents of one_double_t:\[ \r\n\]+1\\.111110\[ \r\n\]+.\[0-9\]+ = \\{double1 = 1\\.111\[0-9\]*\\}" + ".*Contents of one_double_t:\[ \r\n\]+1\\.111110\[ \r\n\]+" \ + ".\[0-9\]+ = \\{double1 = 1\\.111\[0-9\]*\\}" } if {![gdb_skip_float_test "print print_two_floats(*f3)"] && \ ![gdb_skip_stdio_test "print print_two_floats(*f3)"] } { print_struct_call "print_two_floats(*f3)" \ - ".*Contents of two_floats_t:\[ \r\n\]+-2\\.345000\[ \t]+1\\.000000\[ \r\n\]+.\[0-9\]+ = \\{float1 = -2\\.34500003, float2 = 1\\}" + ".*Contents of two_floats_t:\[ \r\n\]+-2\\.345000\[ \t]+1\\.000000\[ \r\n\]+" \ + ".\[0-9\]+ = \\{float1 = -2\\.34500003, float2 = 1\\}" } if ![gdb_skip_stdio_test "print print_bit_flags_char(*cflags)"] { print_struct_call "print_bit_flags_char(*cflags)" \ - ".*alpha\[ \r\n\]+gamma\[ \r\n\]+epsilon\[ \r\n\]+.\[0-9\]+ = \\{alpha = 1 '\\\\001', beta = 0 '\\\\000', gamma = 1 '\\\\001', delta = 0 '\\\\000', epsilon = 1 '\\\\001', omega = 0 '\\\\000'\\}" + ".*alpha\[ \r\n\]+gamma\[ \r\n\]+epsilon\[ \r\n\]+" \ + ".\[0-9\]+ = \\{alpha = 1 '\\\\001', beta = 0 '\\\\000', gamma = 1 '\\\\001', delta = 0 '\\\\000', epsilon = 1 '\\\\001', omega = 0 '\\\\000'\\}" } if ![gdb_skip_stdio_test "print print_bit_flags_short(*sflags)"] { print_struct_call "print_bit_flags_short(*sflags)" \ - ".*alpha\[ \r\n\]+gamma\[ \r\n\]+epsilon\[ \r\n\]+.\[0-9\]+ = \\{alpha = 1, beta = 0, gamma = 1, delta = 0, epsilon = 1, omega = 0\\}" + ".*alpha\[ \r\n\]+gamma\[ \r\n\]+epsilon\[ \r\n\]+" \ + ".\[0-9\]+ = \\{alpha = 1, beta = 0, gamma = 1, delta = 0, epsilon = 1, omega = 0\\}" } if ![gdb_skip_stdio_test "print print_bit_flags(*flags)"] { print_struct_call "print_bit_flags(*flags)" \ - ".*alpha\[ \r\n\]+gamma\[ \r\n\]+epsilon\[ \r\n\]+.\[0-9\]+ = \\{alpha = 1, beta = 0, gamma = 1, delta = 0, epsilon = 1, omega = 0\\}" + ".*alpha\[ \r\n\]+gamma\[ \r\n\]+epsilon\[ \r\n\]+" \ + ".\[0-9\]+ = \\{alpha = 1, beta = 0, gamma = 1, delta = 0, epsilon = 1, omega = 0\\}" } if ![gdb_skip_stdio_test "print print_bit_flags_combo(*flags_combo)"] { print_struct_call "print_bit_flags_combo(*flags_combo)" \ - ".*alpha\[ \r\n\]+gamma\[ \r\n\]+epsilon\[ \r\n\]+ch1: y\[ \t\]+ch2: n\[ \r\n\]+.\[0-9\]+ = \\{alpha = 1, beta = 0, ch1 = 121 'y', gamma = 1, delta = 0, ch2 = 110 'n', epsilon = 1, omega = 0\\}" + ".*alpha\[ \r\n\]+gamma\[ \r\n\]+epsilon\[ \r\n\]+ch1: y\[ \t\]+ch2: n\[ \r\n\]+" \ + ".\[0-9\]+ = \\{alpha = 1, beta = 0, ch1 = 121 'y', gamma = 1, delta = 0, ch2 = 110 'n', epsilon = 1, omega = 0\\}" } if ![gdb_skip_stdio_test "print print_three_chars(*three_chars)"] { print_struct_call "print_three_chars(*three_char)" \ - ".*Contents of three_char_t:\[ \r\n\]+x\[ \t\]+y\[ \t\]+z\[ \r\n\]+.\[0-9\]+ = \\{ch1 = 120 'x', ch2 = 121 'y', ch3 = 122 'z'\\}" + ".*Contents of three_char_t:\[ \r\n\]+x\[ \t\]+y\[ \t\]+z\[ \r\n\]+" \ + ".\[0-9\]+ = \\{ch1 = 120 'x', ch2 = 121 'y', ch3 = 122 'z'\\}" } if ![gdb_skip_stdio_test "print print_five_chars(*five_chars)"] { print_struct_call "print_five_chars(*five_char)" \ - ".*Contents of five_char_t:\[ \r\n\]+h\[ \t\]+e\[ \t\]+l\[ \t\]+l\[ \t\]+o\[ \r\n\]+.\[0-9\]+ = \\{ch1 = 104 'h', ch2 = 101 'e', ch3 = 108 'l', ch4 = 108 'l', ch5 = 111 'o'\\}" + ".*Contents of five_char_t:\[ \r\n\]+h\[ \t\]+e\[ \t\]+l\[ \t\]+l\[ \t\]+o\[ \r\n\]+" \ + ".\[0-9\]+ = \\{ch1 = 104 'h', ch2 = 101 'e', ch3 = 108 'l', ch4 = 108 'l', ch5 = 111 'o'\\}" } if ![gdb_skip_stdio_test "print print_int_char_combo(*int_char_combo)"] { print_struct_call "print_int_char_combo(*int_char_combo)" \ - ".*Contents of int_char_combo_t:\[ \r\n\]+13\[ \t\]+!\[ \r\n\]+.\[0-9\]+ = \\{int1 = 13, ch1 = 33 '!'\\}" + ".*Contents of int_char_combo_t:\[ \r\n\]+13\[ \t\]+!\[ \r\n\]+" \ + ".\[0-9\]+ = \\{int1 = 13, ch1 = 33 '!'\\}" } return