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=-17.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, 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 AE36AC433DB for ; Thu, 14 Jan 2021 02:08:25 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 57367235E4 for ; Thu, 14 Jan 2021 02:08:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 57367235E4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=bC7MxkPIBMJHerRVnffiv0E+p7cWZK6yxPwP4tYFDA8=; b=IzIKa8bM2kkNS0hgzoQxSrbAp oPGOTGh6PYJ+9ZG7Vx8aXeYhRvq6GS+EGlgIxvAu+Rf8C59mQVS2KlTft5Cijyb2h4zNMT9tRBEG4 +vrgVnaNYSt6yU0YcNsUnxdq2IwcbQ/aBxlwZ/J70i9Apenjp+KKYkpv3BY1hDD12L+X5Lh9kN7jD HXd0cBxTeJ+YtQrH8MDqGo1WqpJrKJmgHyq7tO2y0rALx0mOs5pr4kE5OzWrIyyQbor3F1QkQ2bCH qBlqAyzaETxHCm3ZqVmA6mNLbRa6162CnmCOpENPdcEMrtYcMb7F536nTZszryEnHY+6yyESkqFJe Rg4KApO9Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kzs25-0001jt-Ct; Thu, 14 Jan 2021 02:06:41 +0000 Received: from mail-ot1-f43.google.com ([209.85.210.43]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kzs1g-0001c0-0g for linux-arm-kernel@lists.infradead.org; Thu, 14 Jan 2021 02:06:23 +0000 Received: by mail-ot1-f43.google.com with SMTP id n42so3848861ota.12 for ; Wed, 13 Jan 2021 18:06:15 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cMWBDEKf74JKkqccLeDtjQtyXiOgJF8ujNiX0uD1tgM=; b=bHqKuCHgn9uUkPhKD4myif6M8WFz/d7W+5LQIdWvyWHsPtnECyKp6MyI27vJFTC9bB IPXIG22PUtt5DRoxC/vVAfSBC77xX4RvBtzZ6MRlqt31jfvXF5pPApvXc1rE9D6nMrxt e8UN/N9rt+NkaUwJBfsLo81/qzn5hPSSsn2fqZPbGg9f+9u64Df4rPBWUlbpXRClUNoU sG7iCFnzRY1ntuQu+uvk2e62lMtLHMBEOgp2ZfRVWrHlOf2GG3IURgJtqz+Bliz3xkNt d8C7KS2bKw49SqX7NlTPASfaroYHgP+0/6+4e2xp6Oab/1gBoUWbOavc/NDLTDtyBevY s6yQ== X-Gm-Message-State: AOAM533JnBF7lCbS9Rat6Ot0CSq4Q2U28/VVCN1s1ptyDwpBL1VKTbom LhdSoVWviXMB1twNlUukVw== X-Google-Smtp-Source: ABdhPJwBKEYspqg1j2a3qdSUdWbvILQCL6YqhKzqHbLNsDOymO0a6N9WVyiO8JAlOJkU7ZXfTundEg== X-Received: by 2002:a9d:a4e:: with SMTP id 72mr3213614otg.267.1610589975581; Wed, 13 Jan 2021 18:06:15 -0800 (PST) Received: from xps15.herring.priv (24-155-109-49.dyn.grandenetworks.net. [24.155.109.49]) by smtp.googlemail.com with ESMTPSA id x20sm814272oov.33.2021.01.13.18.06.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Jan 2021 18:06:14 -0800 (PST) From: Rob Herring To: Will Deacon , Catalin Marinas , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Jiri Olsa , Mark Rutland Subject: [PATCH v5 5/9] libperf: tests: Add support for verbose printing Date: Wed, 13 Jan 2021 20:06:01 -0600 Message-Id: <20210114020605.3943992-6-robh@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210114020605.3943992-1-robh@kernel.org> References: <20210114020605.3943992-1-robh@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210113_210616_206644_3C9A93AC X-CRM114-Status: GOOD ( 17.79 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ian Rogers , Alexander Shishkin , linux-kernel@vger.kernel.org, honnappa.nagarahalli@arm.com, Raphael Gault , Jonathan Cameron , Namhyung Kim , Itaru Kitayama , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add __T_VERBOSE() so tests can add verbose output. The verbose output is enabled with the '-v' command line option. Signed-off-by: Rob Herring --- v5: - Pass verbose flag to static tests - Fix getopt loop with unsigned char (arm64) v3: - New patch --- tools/lib/perf/include/internal/tests.h | 32 +++++++++++++++++++++++++ tools/lib/perf/tests/Makefile | 6 +++-- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/tools/lib/perf/include/internal/tests.h b/tools/lib/perf/include/internal/tests.h index 2093e8868a67..29425c2dabe1 100644 --- a/tools/lib/perf/include/internal/tests.h +++ b/tools/lib/perf/include/internal/tests.h @@ -3,11 +3,32 @@ #define __LIBPERF_INTERNAL_TESTS_H #include +#include int tests_failed; +int tests_verbose; + +static inline int get_verbose(char **argv, int argc) +{ + int c; + int verbose = 0; + + while ((c = getopt(argc, argv, "v")) != -1) { + switch (c) + { + case 'v': + verbose = 1; + break; + default: + break; + } + } + return verbose; +} #define __T_START \ do { \ + tests_verbose = get_verbose(argv, argc); \ fprintf(stdout, "- running %s...", __FILE__); \ fflush(NULL); \ tests_failed = 0; \ @@ -30,4 +51,15 @@ do { } \ } while (0) +#define __T_VERBOSE(...) \ +do { \ + if (tests_verbose) { \ + if (tests_verbose == 1) { \ + fputc('\n', stderr); \ + tests_verbose++; \ + } \ + fprintf(stderr, ##__VA_ARGS__); \ + } \ +} while (0) + #endif /* __LIBPERF_INTERNAL_TESTS_H */ diff --git a/tools/lib/perf/tests/Makefile b/tools/lib/perf/tests/Makefile index 96841775feaf..b536cc9a26dd 100644 --- a/tools/lib/perf/tests/Makefile +++ b/tools/lib/perf/tests/Makefile @@ -5,6 +5,8 @@ TESTS = test-cpumap test-threadmap test-evlist test-evsel TESTS_SO := $(addsuffix -so,$(TESTS)) TESTS_A := $(addsuffix -a,$(TESTS)) +TEST_ARGS := $(if $(V),-v) + # Set compile option CFLAGS ifdef EXTRA_CFLAGS CFLAGS := $(EXTRA_CFLAGS) @@ -28,9 +30,9 @@ all: $(TESTS_A) $(TESTS_SO) run: @echo "running static:" - @for i in $(TESTS_A); do ./$$i; done + @for i in $(TESTS_A); do ./$$i $(TEST_ARGS); done @echo "running dynamic:" - @for i in $(TESTS_SO); do LD_LIBRARY_PATH=../ ./$$i; done + @for i in $(TESTS_SO); do LD_LIBRARY_PATH=../ ./$$i $(TEST_ARGS); done clean: $(call QUIET_CLEAN, tests)$(RM) $(TESTS_A) $(TESTS_SO) -- 2.27.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel