From 20c6f1e176f4139ed1e76d4256e70149e38c0820 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Thu, 7 Aug 2014 16:09:38 +0800 Subject: Remove duplicated code on checking address 0x0 is accessiable I find some gdb.python tests fail on arm-none-eabi target, because the tests assume that memory on address 0x is inaccessible. Some tests (in gdb.base) are aware of this, so do a "x 0" check first. However, the code is copy-n-paste. This patch is to move the "x 0" check to a procedure in lib/gdb.exp, and get needed tests call it. The original code matches pattern "0x0:\[ \t\]*Error accessing memory address 0x0\r\n$gdb_prompt $", but I remove it from the new proc is_address_zero_readable, because GDB doesn't emit such message any more. gdb/testsuite: 2014-08-09 Yao Qi * gdb.base/display.exp: Invoke is_address_zero_readable. * gdb.guile/scm-value.exp (test_value_in_inferior): Likewise. * gdb.python/py-value.exp (test_value_in_inferior): Likewise. * gdb.base/hbreak-unmapped.exp: Return if is_address_zero_readable returns true. * gdb.base/signest.exp: Likewise. * gdb.base/signull.exp: Likewise. * gdb.base/sigbpt.exp: Likewise. * gdb.guile/scm-disasm.exp: Do the test if is_address_zero_readable returns false. * gdb.guile/scm-pretty-print.exp (run_lang_tests): Likewise. * gdb.python/py-arch.exp: Likewise. * gdb.python/py-prettyprint.exp (run_lang_tests): Likewise. * lib/gdb.exp (is_address_zero_readable): New proc. --- gdb/testsuite/gdb.base/signest.exp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'gdb/testsuite/gdb.base/signest.exp') diff --git a/gdb/testsuite/gdb.base/signest.exp b/gdb/testsuite/gdb.base/signest.exp index 258e86e..64ceb72 100644 --- a/gdb/testsuite/gdb.base/signest.exp +++ b/gdb/testsuite/gdb.base/signest.exp @@ -38,13 +38,9 @@ if ![runto_main] then { # especially on targets without an MMU. Don't run the tests in that # case. -gdb_test_multiple "x 0" "memory at address 0" { - -re "0x0:.*Cannot access memory at address 0x0.*$gdb_prompt $" { } - -re "0x0:.*Error accessing memory address 0x0.*$gdb_prompt $" { } - -re ".*$gdb_prompt $" { - untested "Memory at address 0 is possibly executable" - return -1 - } +if { [is_address_zero_readable] } { + untested "Memory at address 0 is possibly executable" + return -1 } # Run until we hit the SIGSEGV (or SIGBUS on some platforms). -- cgit v1.1