From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 28981 invoked by alias); 18 Jul 2013 23:06:49 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 28952 invoked by uid 89); 18 Jul 2013 23:06:49 -0000 X-Spam-SWARE-Status: No, score=-3.3 required=5.0 tests=AWL,BAYES_20,KHOP_RCVD_UNTRUST,KHOP_THREADED,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL,RDNS_NONE autolearn=no version=3.3.1 Received: from Unknown (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Thu, 18 Jul 2013 23:06:48 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1UzxHU-0005hE-2x from Yao_Qi@mentor.com ; Thu, 18 Jul 2013 16:06:40 -0700 Received: from SVR-ORW-FEM-02.mgc.mentorg.com ([147.34.96.206]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Thu, 18 Jul 2013 16:06:40 -0700 Received: from qiyao.dyndns.org (147.34.91.1) by svr-orw-fem-02.mgc.mentorg.com (147.34.96.168) with Microsoft SMTP Server id 14.2.247.3; Thu, 18 Jul 2013 16:06:38 -0700 Message-ID: <51E874D1.9070107@codesourcery.com> Date: Thu, 18 Jul 2013 23:06:00 -0000 From: Yao Qi User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20130110 Thunderbird/17.0.2 MIME-Version: 1.0 To: Tom Tromey CC: Pedro Alves , Subject: Re: [PATCH] Rely on beneath to do partial xfer from tfile target References: <1363774156-31949-1-git-send-email-yao@codesourcery.com> <5149A022.7070302@redhat.com> <514C291B.7010201@codesourcery.com> <87k3kpdknw.fsf@fleche.redhat.com> In-Reply-To: <87k3kpdknw.fsf@fleche.redhat.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-SW-Source: 2013-07/txt/msg00461.txt.bz2 On 07/18/2013 03:57 AM, Tom Tromey wrote: > I think this can use prepare_for_testing. > Fixed. > Yao> + with_test_prefix "/wo setting traceframe" { > > More normal is "w/o". > > Yao> + with_test_prefix "/w setting traceframe" { > > .. and "w/". > > This occurs in a couple places. Oh, sorry about that. Fixed. > > The patch is ok with those fixes. Thanks. That patch is regression tested again on current GDB trunk with board file unix and native-gdbserver respectively. Committed. -- Yao (齐尧) gdb/testsuite: 2013-07-19 Yao Qi * gdb.trace/read-memory.c: New. * gdb.trace/read-memory.exp: New. --- gdb/testsuite/gdb.trace/read-memory.c | 46 +++++++++ gdb/testsuite/gdb.trace/read-memory.exp | 162 +++++++++++++++++++++++++++++++ 2 files changed, 208 insertions(+), 0 deletions(-) create mode 100644 gdb/testsuite/gdb.trace/read-memory.c create mode 100644 gdb/testsuite/gdb.trace/read-memory.exp diff --git a/gdb/testsuite/gdb.trace/read-memory.c b/gdb/testsuite/gdb.trace/read-memory.c new file mode 100644 index 0000000..bc423b9 --- /dev/null +++ b/gdb/testsuite/gdb.trace/read-memory.c @@ -0,0 +1,46 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2013 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +int testglob = 0; + +int testglob_not_collected = 10; + +const int constglob = 10000; + +const int constglob_not_collected = 100; + +static void +start (void) +{} + +static void +end (void) +{} + +int +main (void) +{ + testglob++; + testglob_not_collected++; + + start (); + + testglob++; + testglob_not_collected++; + end (); + return 0; +} diff --git a/gdb/testsuite/gdb.trace/read-memory.exp b/gdb/testsuite/gdb.trace/read-memory.exp new file mode 100644 index 0000000..bb59853 --- /dev/null +++ b/gdb/testsuite/gdb.trace/read-memory.exp @@ -0,0 +1,162 @@ +# Copyright 2013 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +load_lib "trace-support.exp" + +standard_testfile + +if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { + untested $testfile.exp + return -1 +} + +if ![runto_main] { + fail "Can't run to main to check for trace support" + return -1 +} + +if ![gdb_target_supports_trace] { + unsupported "target does not support trace" + return -1 +} + +# Set tracepoints, start tracing and collect data. + +proc set_tracepoint_and_collect { } { + global testfile srcfile + + # Start with a fresh gdb. + clean_restart ${testfile} + if ![runto_main] { + fail "Can't run to main" + return -1 + } + gdb_test "break end" "Breakpoint \[0-9\] at .*" + gdb_test "trace start" "Tracepoint \[0-9\] at .*" + gdb_trace_setactions "set action for tracepoint" "" \ + "collect testglob" "^$" \ + "collect constglob" "^$" + + gdb_test_no_output "tstart" + gdb_test "continue" ".*Breakpoint.* end .*at.*$srcfile.*" \ + "continue to end" + gdb_test_no_output "tstop" +} + +with_test_prefix "live" { + set_tracepoint_and_collect + + gdb_test "print testglob" " = 2" + gdb_test "print testglob_not_collected" " = 12" + gdb_test "print constglob" " = 10000" + gdb_test "print constglob_not_collected" " = 100" +} + +with_test_prefix "live target tfind" { + gdb_test "tfind 0" "Found trace frame 0, tracepoint \[0-9\]+.*" \ + "tfind 0" + gdb_test "print testglob" " = 1" + gdb_test "print testglob_not_collected" " = " + gdb_test "print constglob" " = 10000" + gdb_test "print constglob_not_collected" " = 100" + gdb_test "tfind" "Target failed to find requested trace frame." \ + "tfind does not find a second frame" +} + +# Save trace frames to trace file. +set tracefile [standard_output_file ${testfile}] +gdb_test "tsave ${tracefile}.tfile" \ + "Trace data saved to file '${tracefile}.tfile'.*" \ + "save tfile trace" + +# Test read memory when changing target from remote to ${target}. + +proc test_from_remote { target } { + global gdb_prompt testfile + global tracefile + + with_test_prefix "remote to ${target}" { + set_tracepoint_and_collect + + # Change target to ${target}. + set test "change target" + gdb_test_multiple "target ${target} ${tracefile}.${target}" "$test" { + -re "A program is being debugged already. Kill it. .y or n. " { + send_gdb "y\n" + exp_continue + } + -re "$gdb_prompt $" { + pass "$test" + } + } + + with_test_prefix "w/o setting traceframe" { + gdb_test "print testglob" "Cannot access memory at address.*" + gdb_test "print testglob_not_collected" \ + "Cannot access memory at address.*" + gdb_test "print constglob" " = 10000" + gdb_test "print constglob_not_collected" " = 100" + } + with_test_prefix "w/ setting traceframe" { + gdb_test "tfind 0" "Found trace frame 0, tracepoint \[0-9\]+.*" \ + "tfind 0" + gdb_test "print testglob" " = 1" + gdb_test "print testglob_not_collected" " = " + gdb_test "print constglob" " = 10000" + gdb_test "print constglob_not_collected" " = 100" + gdb_test "tfind" "Target failed to find requested trace frame." \ + "tfind does not find a second frame" + } + } +} + +test_from_remote "tfile" + +# Test read memory when changing target from exec to ${target} + +proc teset_from_exec { target } { + global srcdir subdir binfile testfile + global tracefile + + # Restart GDB and read the trace data in ${target} target. + gdb_exit + gdb_start + gdb_reinitialize_dir $srcdir/$subdir + gdb_file_cmd $binfile + + gdb_test "target ${target} ${tracefile}.${target}" ".*" \ + "change to ${target} target" + + with_test_prefix "exec to ${target} w/o setting traceframe" { + gdb_test "print testglob" "Cannot access memory at address.*" + gdb_test "print testglob_not_collected" \ + "Cannot access memory at address.*" + gdb_test "print constglob" " = 10000" + gdb_test "print constglob_not_collected" " = 100" + } + + with_test_prefix "exec to ${target} w/ setting traceframe" { + gdb_test "tfind 0" "Found trace frame 0, tracepoint \[0-9\]+.*" \ + "tfind 0" + gdb_test "print testglob" " = 1" + gdb_test "print testglob_not_collected" " = " + gdb_test "print constglob" " = 10000" + gdb_test "print constglob_not_collected" " = 100" + gdb_test "tfind" "Target failed to find requested trace frame." \ + "tfind does not find a second frame" + } +} + +teset_from_exec "tfile" -- 1.7.7.6