This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[RFA/commit] use gdb_test_no_output in gdb.python/py-inferior.exp
- From: Joel Brobecker <brobecker at adacore dot com>
- To: gdb-patches at sourceware dot org
- Cc: Joel Brobecker <brobecker at adacore dot com>
- Date: Mon, 28 Feb 2011 16:20:56 +0400
- Subject: [RFA/commit] use gdb_test_no_output in gdb.python/py-inferior.exp
Any reason not to use gdb_no_output throughout this testcase?
I also noticed that some of the test had a traling '\' - it did not
cause any trouble because they were always followed by an empty line.
This patch fixes this almost as a side-effect.
(most of the changes below were done mechanically - using search and
replace)
gdb/testsuite/ChangeLog:
* gdb.python/py-inferior.exp: Use gdb_test_no_output instead of
gdb_test when running a test where we expected no output back.
Tested on x86_64-linux.
---
gdb/testsuite/gdb.python/py-inferior.exp | 78 +++++++++++++++---------------
1 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/gdb/testsuite/gdb.python/py-inferior.exp b/gdb/testsuite/gdb.python/py-inferior.exp
index 2e9c5e0..c219117 100644
--- a/gdb/testsuite/gdb.python/py-inferior.exp
+++ b/gdb/testsuite/gdb.python/py-inferior.exp
@@ -91,8 +91,8 @@ set one_pattern_found "${newline}.${dec_number}"
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 "py start_addr = search_buf.address" "" ""
-gdb_test "py length = search_buf.type.sizeof" "" ""
+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"
@@ -109,51 +109,51 @@ 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 "py from struct import *" "" ""
+gdb_test_no_output "py from struct import *"
# Test 16-bit pattern.
-gdb_test "set int16_search_buf\[10\] = 0x1234" "" ""
-gdb_test "py search_buf = gdb.selected_frame ().read_var ('int16_search_buf')" "" ""
-gdb_test "py start_addr = search_buf.address" "" ""
-gdb_test "py length = search_buf.type.sizeof" "" ""
-gdb_test "py pattern = pack('${python_pack_char}H',0x1234)" "" \
+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 "set int32_search_buf\[10\] = 0x12345678" "" ""
-gdb_test "py search_buf = gdb.selected_frame ().read_var ('int32_search_buf')" "" ""
-gdb_test "py start_addr = search_buf.address" "" ""
-gdb_test "py length = search_buf.type.sizeof" "" ""
-gdb_test "py pattern = pack('${python_pack_char}I',0x12345678)" "" \
+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 "set int64_search_buf\[10\] = 0xfedcba9876543210LL" "" ""
-gdb_test "py search_buf = gdb.selected_frame ().read_var ('int64_search_buf')" "" ""
-gdb_test "py start_addr = search_buf.address" "" ""
-gdb_test "py length = search_buf.type.sizeof" "" ""
-gdb_test "py pattern = pack('${python_pack_char}Q', 0xfedcba9876543210)" "" ""
+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 "set *(int8_t*) &search_buf\[10\] = 0x62" "" ""
-gdb_test "set *(int16_t*) &search_buf\[11\] = 0x6363" "" ""
-gdb_test "set *(int32_t*) &search_buf\[13\] = 0x64646464" "" ""
-gdb_test "py search_buf = gdb.selected_frame ().read_var ('search_buf')" "" ""
-gdb_test "py start_addr = search_buf\[0\].address" "" ""
-gdb_test "py pattern1 = pack('B', 0x62)" "" ""
-gdb_test "py pattern2 = pack('${python_pack_char}H', 0x6363)" "" ""
-gdb_test "py pattern3 = pack('${python_pack_char}I', 0x64646464)" "" ""
+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"
@@ -168,26 +168,26 @@ gdb_test "py print gdb.inferiors()\[0\].search_memory (start_addr, 100, pattern3
set CHUNK_SIZE 16000 ;
-gdb_test "set *(int32_t*) &search_buf\[0*${CHUNK_SIZE}+100\] = 0x12345678" "" ""
-gdb_test "set *(int32_t*) &search_buf\[1*${CHUNK_SIZE}+100\] = 0x12345678" "" ""
-gdb_test "py start_addr = gdb.selected_frame ().read_var ('search_buf')" "" ""
-gdb_test "py length = gdb.selected_frame ().read_var ('search_buf_size')" "" ""
-gdb_test "py pattern = pack('${python_pack_char}I', 0x12345678)" "" ""
-gdb_test "py first = gdb.inferiors()\[0\].search_memory (start_addr,length, pattern)" "" ""
+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 length = 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,length, pattern)"
gdb_test "py print first" "${one_pattern_found}" "search spanning large range 1st result"
-gdb_test "py start_addr = first + 1"
-gdb_test "py second = gdb.inferiors()\[0\].search_memory (start_addr, length, pattern)" "" ""
+gdb_test_no_output "py start_addr = first + 1"
+gdb_test_no_output "py second = gdb.inferiors()\[0\].search_memory (start_addr, length, pattern)"
gdb_test "py print second" "${one_pattern_found}" "search spanning large range 2nd result"
-gdb_test "py start_addr = second + 1"
-gdb_test "py third = gdb.inferiors()\[0\].search_memory (start_addr, length, pattern)" "" ""
+gdb_test_no_output "py start_addr = second + 1"
+gdb_test_no_output "py third = gdb.inferiors()\[0\].search_memory (start_addr, length, 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 "set *(int32_t*) &search_buf\[${CHUNK_SIZE}-1\] = 0xfdb97531" "" ""
- gdb_test "py pattern = pack('${python_pack_char}I', 0xfdb97531)" "" ""
- gdb_test "py start_addr = gdb.selected_frame ().read_var ('search_buf')" "" ""
+ 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, length, pattern)" \
"${one_pattern_found}" "find pattern straddling chunk boundary"
}
--
1.7.1