From patchwork Thu Oct 22 09:58:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Alves X-Patchwork-Id: 9304 Received: (qmail 37261 invoked by alias); 22 Oct 2015 09:59:11 -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 37188 invoked by uid 89); 22 Oct 2015 09:59:10 -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, RP_MATCHES_RCVD, SPF_HELO_PASS 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; Thu, 22 Oct 2015 09:59:08 +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 (Postfix) with ESMTPS id 6C3FD8EA53 for ; Thu, 22 Oct 2015 09:59:07 +0000 (UTC) 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 t9M9x5Fs014526 for ; Thu, 22 Oct 2015 05:59:06 -0400 From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PATCH 1/6] Make gdb.python/py-inferior.exp test names unique Date: Thu, 22 Oct 2015 10:58:59 +0100 Message-Id: <1445507944-9197-2-git-send-email-palves@redhat.com> In-Reply-To: <1445507944-9197-1-git-send-email-palves@redhat.com> References: <1445507944-9197-1-git-send-email-palves@redhat.com> Before we had: $ cat testsuite/gdb.sum | grep "PASS" | sort | uniq -c | sort -n ... 1 PASS: gdb.python/py-inferior.exp: write str 2 PASS: gdb.python/py-inferior.exp: Get inferior list length 2 PASS: gdb.python/py-inferior.exp: py start_addr = gdb.selected_frame ().read_var ('search_buf') 2 PASS: gdb.python/py-inferior.exp: Switch to first inferior 3 PASS: gdb.python/py-inferior.exp: find mixed-sized pattern 4 PASS: gdb.python/py-inferior.exp: py length = search_buf.type.sizeof 4 PASS: gdb.python/py-inferior.exp: py start_addr = search_buf.address 5 PASS: gdb.python/py-inferior.exp: Check inferior validity $ gdb/testsuite/ChangeLog: 2015-10-22 Pedro Alves * gdb.python/py-inferior.exp: Use with_test_prefix. Consistently use lowercase. --- gdb/testsuite/gdb.python/py-inferior.exp | 217 +++++++++++++++++-------------- 1 file changed, 117 insertions(+), 100 deletions(-) diff --git a/gdb/testsuite/gdb.python/py-inferior.exp b/gdb/testsuite/gdb.python/py-inferior.exp index b8ac9c8..8a20542 100644 --- a/gdb/testsuite/gdb.python/py-inferior.exp +++ b/gdb/testsuite/gdb.python/py-inferior.exp @@ -99,135 +99,152 @@ set one_pattern_found "${newline}.${dec_number}" # Test string pattern. -gdb_test "set *(int32_t*) &int8_search_buf\[10\] = 0x61616161" "" "" -gdb_test "py search_buf = gdb.selected_frame ().read_var ('int8_search_buf')" "" "" -gdb_test_no_output "py start_addr = search_buf.address" -gdb_test_no_output "py length = search_buf.type.sizeof" - -gdb_test "py print (gdb.inferiors()\[0\].search_memory (start_addr, length, 'aaa'))" \ - "${one_pattern_found}" "find string pattern" - -# Test not finding pattern because search range too small, with -# potential find at the edge of the range. - -gdb_test "py print (gdb.inferiors()\[0\].search_memory (start_addr, 10+3, 'aaaa'))" \ - "${pattern_not_found}" "pattern not found at end of range" - -# Increase the search range by 1 and we should find the pattern. - -gdb_test "py print (gdb.inferiors()\[0\].search_memory (start_addr, 10+3+1, 'aaa'))" \ - "${one_pattern_found}" "pattern found at end of range" +with_test_prefix "string" { + gdb_test "set *(int32_t*) &int8_search_buf\[10\] = 0x61616161" + gdb_test "py search_buf = gdb.selected_frame ().read_var ('int8_search_buf')" + gdb_test_no_output "py start_addr = search_buf.address" + gdb_test_no_output "py length = search_buf.type.sizeof" + + gdb_test "py print (gdb.inferiors()\[0\].search_memory (start_addr, length, 'aaa'))" \ + "${one_pattern_found}" "find string pattern" + + # Test not finding pattern because search range too small, with + # potential find at the edge of the range. + gdb_test "py print (gdb.inferiors()\[0\].search_memory (start_addr, 10+3, 'aaaa'))" \ + "${pattern_not_found}" "pattern not found at end of range" + + # Increase the search range by 1 and we should find the pattern. + gdb_test "py print (gdb.inferiors()\[0\].search_memory (start_addr, 10+3+1, 'aaa'))" \ + "${one_pattern_found}" "pattern found at end of range" +} # Import struct to pack the following patterns. gdb_test_no_output "py from struct import *" # Test 16-bit pattern. -gdb_test_no_output "set int16_search_buf\[10\] = 0x1234" -gdb_test_no_output "py search_buf = gdb.selected_frame ().read_var ('int16_search_buf')" -gdb_test_no_output "py start_addr = search_buf.address" -gdb_test_no_output "py length = search_buf.type.sizeof" -gdb_test_no_output "py pattern = pack('${python_pack_char}H',0x1234)" - -gdb_test "py print (gdb.inferiors()\[0\].search_memory (start_addr, length, pattern))" \ - "${one_pattern_found}" "find 16-bit pattern, with value pattern" +with_test_prefix "16-bit" { + gdb_test_no_output "set int16_search_buf\[10\] = 0x1234" + gdb_test_no_output "py search_buf = gdb.selected_frame ().read_var ('int16_search_buf')" + gdb_test_no_output "py start_addr = search_buf.address" + gdb_test_no_output "py length = search_buf.type.sizeof" + gdb_test_no_output "py pattern = pack('${python_pack_char}H',0x1234)" + gdb_test "py print (gdb.inferiors()\[0\].search_memory (start_addr, length, pattern))" \ + "${one_pattern_found}" "find 16-bit pattern, with value pattern" +} # Test 32-bit pattern. -gdb_test_no_output "set int32_search_buf\[10\] = 0x12345678" -gdb_test_no_output "py search_buf = gdb.selected_frame ().read_var ('int32_search_buf')" -gdb_test_no_output "py start_addr = search_buf.address" -gdb_test_no_output "py length = search_buf.type.sizeof" -gdb_test_no_output "py pattern = pack('${python_pack_char}I',0x12345678)" - -gdb_test "py print (gdb.inferiors()\[0\].search_memory (start_addr, length, pattern))" \ - "${one_pattern_found}" "find 32-bit pattern, with python pattern" +with_test_prefix "32-bit" { + gdb_test_no_output "set int32_search_buf\[10\] = 0x12345678" + gdb_test_no_output "py search_buf = gdb.selected_frame ().read_var ('int32_search_buf')" + gdb_test_no_output "py start_addr = search_buf.address" + gdb_test_no_output "py length = search_buf.type.sizeof" + gdb_test_no_output "py pattern = pack('${python_pack_char}I',0x12345678)" + gdb_test "py print (gdb.inferiors()\[0\].search_memory (start_addr, length, pattern))" \ + "${one_pattern_found}" "find 32-bit pattern, with python pattern" +} # Test 64-bit pattern. -gdb_test_no_output "set int64_search_buf\[10\] = 0xfedcba9876543210LL" -gdb_test_no_output "py search_buf = gdb.selected_frame ().read_var ('int64_search_buf')" -gdb_test_no_output "py start_addr = search_buf.address" -gdb_test_no_output "py length = search_buf.type.sizeof" -gdb_test_no_output "py pattern = pack('${python_pack_char}Q', 0xfedcba9876543210)" - -gdb_test "py print (gdb.inferiors()\[0\].search_memory (start_addr, length, pattern))" \ - "${one_pattern_found}" "find 64-bit pattern, with value pattern" +with_test_prefix "64-bit" { + gdb_test_no_output "set int64_search_buf\[10\] = 0xfedcba9876543210LL" + gdb_test_no_output "py search_buf = gdb.selected_frame ().read_var ('int64_search_buf')" + gdb_test_no_output "py start_addr = search_buf.address" + gdb_test_no_output "py length = search_buf.type.sizeof" + gdb_test_no_output "py pattern = pack('${python_pack_char}Q', 0xfedcba9876543210)" + gdb_test "py print (gdb.inferiors()\[0\].search_memory (start_addr, length, pattern))" \ + "${one_pattern_found}" "find 64-bit pattern, with value pattern" +} # Test mixed-sized patterns. -gdb_test_no_output "set *(int8_t*) &search_buf\[10\] = 0x62" -gdb_test_no_output "set *(int16_t*) &search_buf\[11\] = 0x6363" -gdb_test_no_output "set *(int32_t*) &search_buf\[13\] = 0x64646464" -gdb_test_no_output "py search_buf = gdb.selected_frame ().read_var ('search_buf')" -gdb_test_no_output "py start_addr = search_buf\[0\].address" -gdb_test_no_output "py pattern1 = pack('B', 0x62)" -gdb_test_no_output "py pattern2 = pack('${python_pack_char}H', 0x6363)" -gdb_test_no_output "py pattern3 = pack('${python_pack_char}I', 0x64646464)" - -gdb_test "py print (gdb.inferiors()\[0\].search_memory (start_addr, 100, pattern1))" \ - "${one_pattern_found}" "find mixed-sized pattern" -gdb_test "py print (gdb.inferiors()\[0\].search_memory (start_addr, 100, pattern2))" \ - "${one_pattern_found}" "find mixed-sized pattern" -gdb_test "py print (gdb.inferiors()\[0\].search_memory (start_addr, 100, pattern3))" \ - "${one_pattern_found}" "find mixed-sized pattern" +with_test_prefix "mixed-sized" { + gdb_test_no_output "set *(int8_t*) &search_buf\[10\] = 0x62" + gdb_test_no_output "set *(int16_t*) &search_buf\[11\] = 0x6363" + gdb_test_no_output "set *(int32_t*) &search_buf\[13\] = 0x64646464" + gdb_test_no_output "py search_buf = gdb.selected_frame ().read_var ('search_buf')" + gdb_test_no_output "py start_addr = search_buf\[0\].address" + gdb_test_no_output "py pattern1 = pack('B', 0x62)" + gdb_test_no_output "py pattern2 = pack('${python_pack_char}H', 0x6363)" + gdb_test_no_output "py pattern3 = pack('${python_pack_char}I', 0x64646464)" + + gdb_test "py print (gdb.inferiors()\[0\].search_memory (start_addr, 100, pattern1))" \ + "${one_pattern_found}" "find mixed-sized pattern 1" + gdb_test "py print (gdb.inferiors()\[0\].search_memory (start_addr, 100, pattern2))" \ + "${one_pattern_found}" "find mixed-sized pattern 2" + gdb_test "py print (gdb.inferiors()\[0\].search_memory (start_addr, 100, pattern3))" \ + "${one_pattern_found}" "find mixed-sized pattern 3" +} # Test search spanning a large range, in the particular case of native # targets, test the search spanning multiple chunks. # Remote targets may implement the search differently. set CHUNK_SIZE 16000 - -gdb_test_no_output "set *(int32_t*) &search_buf\[0*${CHUNK_SIZE}+100\] = 0x12345678" -gdb_test_no_output "set *(int32_t*) &search_buf\[1*${CHUNK_SIZE}+100\] = 0x12345678" -gdb_test_no_output "py start_addr = gdb.selected_frame ().read_var ('search_buf')" -gdb_test_no_output "py end_addr = start_addr + gdb.selected_frame ().read_var ('search_buf_size')" -gdb_test_no_output "py pattern = pack('${python_pack_char}I', 0x12345678)" -gdb_test_no_output "py first = gdb.inferiors()\[0\].search_memory (start_addr,end_addr - start_addr, pattern)" -gdb_test "py print (first)" "${one_pattern_found}" "search spanning large range 1st result" -gdb_test_no_output "py start_addr = first + 1" -gdb_test_no_output "py second = gdb.inferiors()\[0\].search_memory (start_addr, end_addr - start_addr, pattern)" -gdb_test "py print (second)" "${one_pattern_found}" "search spanning large range 2nd result" -gdb_test_no_output "py start_addr = second + 1" -gdb_test_no_output "py third = gdb.inferiors()\[0\].search_memory (start_addr, end_addr - start_addr, pattern)" -gdb_test "py print (third)" "${pattern_not_found}" "search spanning large range 3rd result" +with_test_prefix "large range" { + gdb_test_no_output "set *(int32_t*) &search_buf\[0*${CHUNK_SIZE}+100\] = 0x12345678" + gdb_test_no_output "set *(int32_t*) &search_buf\[1*${CHUNK_SIZE}+100\] = 0x12345678" + gdb_test_no_output "py start_addr = gdb.selected_frame ().read_var ('search_buf')" + gdb_test_no_output "py end_addr = start_addr + gdb.selected_frame ().read_var ('search_buf_size')" + gdb_test_no_output "py pattern = pack('${python_pack_char}I', 0x12345678)" + + gdb_test_no_output "py first = gdb.inferiors()\[0\].search_memory (start_addr,end_addr - start_addr, pattern)" + gdb_test "py print (first)" "${one_pattern_found}" "search spanning large range 1st result" + gdb_test_no_output "py start_addr = first + 1" + gdb_test_no_output "py second = gdb.inferiors()\[0\].search_memory (start_addr, end_addr - start_addr, pattern)" + gdb_test "py print (second)" "${one_pattern_found}" "search spanning large range 2nd result" + gdb_test_no_output "py start_addr = second + 1" + gdb_test_no_output "py third = gdb.inferiors()\[0\].search_memory (start_addr, end_addr - start_addr, pattern)" + gdb_test "py print (third)" "${pattern_not_found}" "search spanning large range 3rd result" +} # For native targets, test a pattern straddling a chunk boundary. if [isnative] { - gdb_test_no_output "set *(int32_t*) &search_buf\[${CHUNK_SIZE}-1\] = 0xfdb97531" - gdb_test_no_output "py pattern = pack('${python_pack_char}I', 0xfdb97531)" - gdb_test_no_output "py start_addr = gdb.selected_frame ().read_var ('search_buf')" - gdb_test "py print (gdb.inferiors()\[0\].search_memory (start_addr, end_addr - start_addr, pattern))" \ - "${one_pattern_found}" "find pattern straddling chunk boundary" + with_test_prefix "straddling" { + gdb_test_no_output "set *(int32_t*) &search_buf\[${CHUNK_SIZE}-1\] = 0xfdb97531" + gdb_test_no_output "py pattern = pack('${python_pack_char}I', 0xfdb97531)" + gdb_test_no_output "py start_addr = gdb.selected_frame ().read_var ('search_buf')" + gdb_test "py print (gdb.inferiors()\[0\].search_memory (start_addr, end_addr - start_addr, pattern))" \ + "${one_pattern_found}" "find pattern straddling chunk boundary" + } } # Test Inferior is_valid. This must always be the last test in # this testcase as it kills the inferior. -gdb_py_test_silent_cmd "python inf_list = gdb.inferiors()" "get initial list" 1 -gdb_test "python print (len(inf_list))" "1" "Get inferior list length" -gdb_test "python print (inf_list\[0\].is_valid())" "True" \ - "Check inferior validity" -gdb_test "add-inferior" "Added inferior 2.*" "add empty inferior 2" -gdb_py_test_silent_cmd "python inf_list = gdb.inferiors()" "get new list" 1 -gdb_test "python print (len(inf_list))" "2" "Get inferior list length" -gdb_test "python print (inf_list\[0\].is_valid())" "True" \ - "Check inferior validity" -gdb_test "python print (inf_list\[1\].is_valid())" "True" \ - "Check inferior validity" -gdb_test_no_output "remove-inferiors 2" "remove-inferiors 3" -gdb_test "python print (inf_list\[0\].is_valid())" "False" \ - "Check inferior validity" -gdb_test "python print (inf_list\[1\].is_valid())" "True" \ - "Check inferior validity" +with_test_prefix "is_valid" { + gdb_py_test_silent_cmd "python inf_list = gdb.inferiors()" "get initial list" 1 + gdb_test "python print (len(inf_list))" "1" "get inferior list length 1" + gdb_test "python print (inf_list\[0\].is_valid())" "True" \ + "check inferior validity 1" + + gdb_test "add-inferior" "Added inferior 2.*" "add empty inferior 2" + gdb_py_test_silent_cmd "python inf_list = gdb.inferiors()" "get new list" 1 + gdb_test "python print (len(inf_list))" "2" "get inferior list length 2" + gdb_test "python print (inf_list\[0\].is_valid())" "True" \ + "check inferior validity 2" + + gdb_test "python print (inf_list\[1\].is_valid())" "True" \ + "check inferior validity 3" + + gdb_test_no_output "remove-inferiors 2" "remove-inferiors 3" + gdb_test "python print (inf_list\[0\].is_valid())" "False" \ + "check inferior validity 4" + + gdb_test "python print (inf_list\[1\].is_valid())" "True" \ + "check inferior validity 5" +} # Test gdb.selected_inferior() -gdb_test "inferior 1" ".*" "Switch to first inferior" -gdb_test "py print (gdb.selected_inferior().num)" "1" "First inferior selected" - -gdb_test "add-inferior" "Added inferior 3" "Create new inferior" -gdb_test "inferior 3" ".*" "Switch to third inferior" -gdb_test "py print (gdb.selected_inferior().num)" "3" "Third inferior selected" -gdb_test "inferior 1" ".*" "Switch to first inferior" -gdb_test_no_output "remove-inferiors 3" "Remove second inferior" +with_test_prefix "selected_inferior" { + gdb_test "inferior 1" ".*" "switch to first inferior" + gdb_test "py print (gdb.selected_inferior().num)" "1" "first inferior selected" + + gdb_test "add-inferior" "Added inferior 3" "create new inferior" + gdb_test "inferior 3" ".*" "switch to third inferior" + gdb_test "py print (gdb.selected_inferior().num)" "3" "third inferior selected" + gdb_test "inferior 1" ".*" "switch back to first inferior" + gdb_test_no_output "remove-inferiors 3" "remove second inferior" +}