From patchwork Tue May 17 17:03:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Tremblay X-Patchwork-Id: 12310 Received: (qmail 130594 invoked by alias); 17 May 2016 17:03:26 -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 130577 invoked by uid 89); 17 May 2016 17:03:25 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.9 required=5.0 tests=BAYES_00, KAM_LAZY_DOMAIN_SECURITY autolearn=no version=3.3.2 spammy=r2, r3, x0, 1376 X-HELO: usplmg20.ericsson.net Received: from usplmg20.ericsson.net (HELO usplmg20.ericsson.net) (198.24.6.45) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Tue, 17 May 2016 17:03:23 +0000 Received: from EUSAAHC004.ericsson.se (Unknown_Domain [147.117.188.84]) by usplmg20.ericsson.net (Symantec Mail Security) with SMTP id 8E.14.09012.6A64B375; Tue, 17 May 2016 18:28:22 +0200 (CEST) Received: from elxa4wqvvz1.dyn.mo.ca.am.ericsson.se (147.117.188.8) by smtps-am.internal.ericsson.com (147.117.188.84) with Microsoft SMTP Server (TLS) id 14.3.248.2; Tue, 17 May 2016 13:03:20 -0400 From: Antoine Tremblay To: CC: Antoine Tremblay Subject: [PATCH 1/4] Move trace conditions tests from ftrace.exp to trace-condition.exp Date: Tue, 17 May 2016 13:03:11 -0400 Message-ID: <1463504594-4419-1-git-send-email-antoine.tremblay@ericsson.com> MIME-Version: 1.0 X-IsSubscribed: yes This patch moves conditional tests that were done in ftrace.exp to trace-conditon.exp. Note that emit_ref is now tested by the anarg local variable there is no need to test the register directly. The test coverage remains the same. gdb/testsuite/ChangeLog: * gdb.trace/ftrace.exp (test_ftrace_condition): Remove. Move condition tests... * gdb.trace/trace-condition.exp: Here. --- gdb/testsuite/gdb.trace/ftrace.exp | 74 ----------------------------- gdb/testsuite/gdb.trace/trace-condition.exp | 2 + 2 files changed, 2 insertions(+), 74 deletions(-) diff --git a/gdb/testsuite/gdb.trace/ftrace.exp b/gdb/testsuite/gdb.trace/ftrace.exp index f770bf7..e90485c 100644 --- a/gdb/testsuite/gdb.trace/ftrace.exp +++ b/gdb/testsuite/gdb.trace/ftrace.exp @@ -174,43 +174,6 @@ proc test_fast_tracepoints {} { } } -# Test compiled-condition -# CONDEXP is the condition expression to be compiled. -# VAR is the variable to be collected for testing. -# LIST is a list of expected values of VAR should be collected -# based on the CONDEXP. -proc test_ftrace_condition { condexp var list } \ -{ with_test_prefix "cond $condexp" \ -{ - global executable - global hex - - clean_restart ${executable} - if ![runto_main] { - fail "Can't run to main to check for trace support" - return -1 - } - - gdb_test "break end" ".*" "" - gdb_test "tvariable \$tsv = 0" - gdb_test "ftrace set_point if $condexp" "Fast tracepoint .*" - gdb_trace_setactions "set action for tracepoint .*" "" \ - "collect $var" "^$" - - gdb_test_no_output "tstart" "" - gdb_test "continue" \ - "Continuing\\.\[ \r\n\]+(Thread .* hit )?Breakpoint.*" "" - gdb_test_no_output "tstop" "" - - set i 0 - foreach expval $list { - gdb_test "tfind" "Found trace frame $i, tracepoint .*" "tfind frame $i" - gdb_test "print $var" "\\$\[0-9\]+ = $expval\[\r\n\]" "expect $expval" - set i [expr $i + 1] - } - gdb_test "tfind" "Target failed to find requested trace frame\." -}} - gdb_reinitialize_dir $srcdir/$subdir if { [gdb_test "info sharedlibrary" ".*${remote_libipa}.*" "IPA loaded"] != 0 } { @@ -219,40 +182,3 @@ if { [gdb_test "info sharedlibrary" ".*${remote_libipa}.*" "IPA loaded"] != 0 } } test_fast_tracepoints - -# Test conditional goto and simple expression. -test_ftrace_condition "globvar > 7" "globvar" { 8 9 10 } -test_ftrace_condition "globvar < 4" "globvar" { 1 2 3 } -test_ftrace_condition "globvar >= 7" "globvar" { 7 8 9 10 } -test_ftrace_condition "globvar <= 4" "globvar" { 1 2 3 4 } -test_ftrace_condition "globvar == 5" "globvar" { 5 } -test_ftrace_condition "globvar != 5" "globvar" { 1 2 3 4 6 7 8 9 10 } -test_ftrace_condition "globvar > 3 && globvar < 7" "globvar" { 4 5 6 } -test_ftrace_condition "globvar < 3 || globvar > 7" "globvar" { 1 2 8 9 10 } -test_ftrace_condition "(globvar << 2) + 1 == 29" "globvar" { 7 } -test_ftrace_condition "(globvar >> 2) == 2" "globvar" { 8 9 10 } - -# Test emit_call by accessing trace state variables. -test_ftrace_condition "(\$tsv = \$tsv + 2) > 10" "globvar" { 6 7 8 9 10 } - -# This expression is used for testing emit_reg. -if [is_amd64_regs_target] { - set arg0exp "\$rdi" -} elseif [is_x86_like_target] { - set arg0exp "*(int *) (\$ebp + 8)" -} elseif { [istarget "aarch64*-*-*"] } { - set arg0exp "\$x0" -} elseif [istarget "powerpc*-*-*"] { - set arg0exp "\$r3" -} elseif { [istarget "s390x-*-*"] } { - set arg0exp "\$r2" -} elseif { [istarget "s390-*-*"] } { - # On targets with 64-bit GPRs, avoid the high part. - set arg0exp "(\$r2 & 0xffffffff)" -} else { - set arg0exp "" -} - -if { "$arg0exp" != "" } { - test_ftrace_condition "($arg0exp > 500)" "globvar" { 6 7 8 9 10 } -} diff --git a/gdb/testsuite/gdb.trace/trace-condition.exp b/gdb/testsuite/gdb.trace/trace-condition.exp index b7427ca..fa031ba 100644 --- a/gdb/testsuite/gdb.trace/trace-condition.exp +++ b/gdb/testsuite/gdb.trace/trace-condition.exp @@ -137,6 +137,8 @@ foreach trace_command { "trace" "ftrace" } { test_tracepoints $trace_command "anarg == 100 && globvar == 1" 1 18955_x86_64_failure # Test various operations to cover as many opcodes as possible. + test_tracepoints $trace_command "21 == 21" 10 + test_tracepoints $trace_command "21 != 42" 10 test_tracepoints $trace_command "21 + 21 == 42" 10 test_tracepoints $trace_command "42 - 21 == 21" 10 test_tracepoints $trace_command "21 * 2 == 42" 10