From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 017B8C3A589 for ; Tue, 20 Aug 2019 19:28:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C642A233A0 for ; Tue, 20 Aug 2019 19:28:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566329303; bh=kMULxAQd0WVORfULSwsKX4J4Ff38utCSOvdLogWUDAQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=uf6jr+lO52QqnlQ8VDDZYl90OOd6bMTepGyroAjSQxtSDY4l4Xb5UzcX7bb0DoWQS 9G47iPPecqvU8tGwX2NYKgdgDvDrB7n3nhl0aUOefH9jr6HrxX8MQNxHJy0gpz/t9d o2nTE0yiuXDK7pcd/ZPtXDucQKzREF7o6t5MhnVI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730845AbfHTT2W (ORCPT ); Tue, 20 Aug 2019 15:28:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:41072 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730795AbfHTT2V (ORCPT ); Tue, 20 Aug 2019 15:28:21 -0400 Received: from quaco.ghostprotocols.net (177.206.236.100.dynamic.adsl.gvt.net.br [177.206.236.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B46C52332A; Tue, 20 Aug 2019 19:28:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566329300; bh=kMULxAQd0WVORfULSwsKX4J4Ff38utCSOvdLogWUDAQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sZwLw6Nluz/D5+QSQ6OAnRGwcrrsxDz4Kgeb2IkDAwpg3HOQN4UB2+MbpaN9unnqW e53E6I+PHf/IYPQzVZVHmZkoy3Is06vUY/MK2MLHSxepi54EBTZ2MRS2C6PKO/le8i D83u62WiRPOTDJCNlpF0IbnlkdG7VtNsbF94372M= From: Arnaldo Carvalho de Melo To: Ingo Molnar , Thomas Gleixner Cc: Jiri Olsa , Namhyung Kim , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, "Steven Rostedt (VMware)" , Tzvetomir Stoyanov , Alexander Shishkin , David Carrillo-Cisneros , He Kuang , Michal rarek , Paul Turner , Peter Zijlstra , Stephane Eranian , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Wang Nan , stable@vger.kernel.org, Arnaldo Carvalho de Melo Subject: [PATCH 07/17] tools lib traceevent: Fix "robust" test of do_generate_dynamic_list_file Date: Tue, 20 Aug 2019 16:27:23 -0300 Message-Id: <20190820192733.19180-8-acme@kernel.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190820192733.19180-1-acme@kernel.org> References: <20190820192733.19180-1-acme@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Steven Rostedt (VMware)" 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. Reported-by: Tzvetomir Stoyanov Signed-off-by: Steven Rostedt (VMware) Cc: Alexander Shishkin Cc: David Carrillo-Cisneros Cc: He Kuang Cc: Jiri Olsa Cc: Michal rarek Cc: Paul Turner Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Uwe Kleine-König Cc: Wang Nan Cc: stable@vger.kernel.org Fixes: 6467753d61399 ("tools lib traceevent: Robustify do_generate_dynamic_list_file") Link: http://lkml.kernel.org/r/20190805130150.25acfeb1@gandalf.local.home Signed-off-by: Arnaldo Carvalho de Melo --- 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 '};'; \ -- 2.21.0