Re: [PATCH 2/3] Testsuite: Rename "end()" to avoid libinproctrace C++ symbol clash

[Simon Marchi <simon.marchi@ericsson.com>]

On 2018-03-14 12:11 PM, Andreas Arnez wrote:
> Some of GDB's trace test cases define a function end() and place a
> breakpoint there with "break end".  However, when libinproctrace is linked
> to the binary, there are multiple methods named "end", such as
> std::string::end() from the C++ library or format_pieces::end() from
> common/format.h.  GDB then creates multiple breakpoints instead of just a
> single one, and some FAILs result, such as these:
> 
>   FAIL: gdb.trace/trace-mt.exp: ftrace on: break end
>   FAIL: gdb.trace/trace-mt.exp: ftrace off: break end
> 
> This is fixed by renaming end() to my_end().  For consistency, where end()
> was paired with a previous begin(), the latter is renamed to my_begin() as
> well.
> 
> gdb/testsuite/ChangeLog:
> 
> 	* gdb.trace/trace-break.c (end): Rename to...
> 	(my_end): ...this.
> 	(main): Adjust call.
> 	* gdb.trace/trace-mt.c (end): Rename to...
> 	(my_end): ...this.
> 	(main): Adjust call.
> 	* gdb.trace/unavailable.cc (begin): Rename to...
> 	(my_begin): ...this.
> 	(end): Rename to...
> 	(my_end): ...this.
> 	(main): Adjust calls.
> 	* gdb.trace/trace-break.exp: Reflect function name change.
> 	* gdb.trace/trace-mt.exp: Likewise.
> 	* gdb.trace/unavailable.exp: Likewise.

Hi Andreas,

Another way would have been to pass "-qualified" to the break command,
or use gdb_breakpoint and pass the "qualified" arg.  There are also
other instances of the same "problem" in tests that don't check the
output of the break command at all...

  gdb_test "break end" ".*" ""

In any case, this patch LGTM.

Thanks,

Simon