From 2320162a6219c664a8da2e2ff68b08d6f6c2ffcc Mon Sep 17 00:00:00 2001 From: Antoine Tremblay Date: Mon, 30 May 2016 11:24:44 -0400 Subject: [PATCH] Add variable length tests for emit_ref in trace-condition.exp This patch add variable length tests for emit_ref by reading the variable passed as argument of 8 to 64 bit. gdb/testsuite/ChangeLog: * gdb.trace/trace-condition.c (marker): Adapt signature to 8 to 64 bits types. (main): Adapt to 8 to 64 bits types. * gdb.trace/trace-condition.exp: Add new tests. --- gdb/testsuite/ChangeLog | 7 +++++++ gdb/testsuite/gdb.trace/trace-condition.c | 8 +++++--- gdb/testsuite/gdb.trace/trace-condition.exp | 7 +++++-- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 3e6ba4fed03..7bf94643ccf 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2016-05-30 Antoine Tremblay + + * gdb.trace/trace-condition.c (marker): Adapt signature to 8 to 64 + bits types. + (main): Adapt to 8 to 64 bits types. + * gdb.trace/trace-condition.exp: Add new tests. + 2016-05-30 Antoine Tremblay * gdb.trace/trace-condition.exp: Add emit_less_unsigned test. diff --git a/gdb/testsuite/gdb.trace/trace-condition.c b/gdb/testsuite/gdb.trace/trace-condition.c index 94bb30cfc9d..f0b1863a597 100644 --- a/gdb/testsuite/gdb.trace/trace-condition.c +++ b/gdb/testsuite/gdb.trace/trace-condition.c @@ -16,8 +16,9 @@ along with this program. If not, see . */ #include "trace-common.h" +#include -int globvar; +int64_t globvar; static void begin (void) @@ -25,7 +26,7 @@ begin (void) } static void -marker (int anarg) +marker (int8_t arg8, int16_t arg16, int32_t arg32, int64_t arg64) { FAST_TRACEPOINT_LABEL(set_point); } @@ -41,7 +42,8 @@ main () begin (); for (globvar = 1; globvar < 11; ++globvar) - marker (globvar * 100); + marker (globvar, globvar + (1 << 8), globvar + (1 << 16), + globvar + (1LL << 32)); end (); return 0; diff --git a/gdb/testsuite/gdb.trace/trace-condition.exp b/gdb/testsuite/gdb.trace/trace-condition.exp index b169c62a464..6f4413d9543 100644 --- a/gdb/testsuite/gdb.trace/trace-condition.exp +++ b/gdb/testsuite/gdb.trace/trace-condition.exp @@ -132,9 +132,12 @@ foreach trace_command { "trace" "ftrace" } { test_tracepoints $trace_command "\$$pcreg == *set_point" 10 # Can we read local variables? - test_tracepoints $trace_command "anarg == 100 || anarg == 200" 2 18955_x86_64_failure + test_tracepoints $trace_command "arg8 == 1 || arg8 == 2" 2 18955_x86_64_failure + test_tracepoints $trace_command "arg16 == 257 || arg16 == 258" 2 18955_x86_64_failure + test_tracepoints $trace_command "arg32 == 65537 || arg32 == 65538" 2 18955_x86_64_failure + test_tracepoints $trace_command "arg64 == 4294967297 || arg64 == 4294967298" 2 18955_x86_64_failure # Can we read global variables? - test_tracepoints $trace_command "anarg == 100 && globvar == 1" 1 18955_x86_64_failure + test_tracepoints $trace_command "arg16 == 257 && globvar == 1" 1 18955_x86_64_failure # Test various operations to cover as many opcodes as possible. test_tracepoints $trace_command "21 == 21" 10 -- 2.30.2