Messages in this thread | | | From | Arnaldo Carvalho de Melo <> | Date | Tue, 13 Aug 2019 18:35:08 -0300 | Subject | Re: [PATCH] tools lib traceevent: Fix "robust" test of do_generate_dynamic_list_file |
| |
Em Tue, Aug 13, 2019 at 05:21:12PM -0400, Steven Rostedt escreveu: > On Mon, 5 Aug 2019 13:01:50 -0400 > Steven Rostedt <rostedt@goodmis.org> wrote: > > > [ > > Not sure why I wasn't Cc'd on the original patch (or the one before that) > > but I guess I need to add tools/lib/traceevent under MAINTAINERs for > > perhaps tracing? > > ] > > > > Ping?
Will apply later today, thanks,
- Arnaldo
> -- Steve > > > From: "Steven Rostedt (VMware)" <rostedt@goodmis.org> > > > > The tools/lib/traceevent/Makefile had a test added to it to detect a failure > > of the "nm" when making the dynamic list file (whatever that is). The > > problem is that the test sorts the values "U W w" and some versions of sort > > will place "w" ahead of "W" (even though it has a higher ASCII value, and > > break the test. > > > > Add 'tr "w" "W"' to merge the two and not worry about the ordering. > > > > Cc: stable@vger.kernel.org > > Fixes: 6467753d61399 ("tools lib traceevent: Robustify do_generate_dynamic_list_file") > > Reported-by: Tzvetomir Stoyanov <tstoyanov@vmware.com> > > Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> > > --- > > tools/lib/traceevent/Makefile | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile > > index 3292c290654f..8352d53dcb5a 100644 > > --- a/tools/lib/traceevent/Makefile > > +++ b/tools/lib/traceevent/Makefile > > @@ -266,8 +266,8 @@ endef > > > > define do_generate_dynamic_list_file > > symbol_type=`$(NM) -u -D $1 | awk 'NF>1 {print $$1}' | \ > > - xargs echo "U W w" | tr ' ' '\n' | sort -u | xargs echo`;\ > > - if [ "$$symbol_type" = "U W w" ];then \ > > + xargs echo "U w W" | tr 'w ' 'W\n' | sort -u | xargs echo`;\ > > + if [ "$$symbol_type" = "U W" ];then \ > > (echo '{'; \ > > $(NM) -u -D $1 | awk 'NF>1 {print "\t"$$2";"}' | sort -u;\ > > echo '};'; \
--
- Arnaldo
| |