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=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 6102CC4727C for ; Thu, 1 Oct 2020 14:02:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 270B721707 for ; Thu, 1 Oct 2020 14:02:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601560925; bh=rrqbBMp2nQRPbDFRxjBKvnpqxIrnLXzSj88KbVPM3Mw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=sTx2neqqzyo2Ou53kpe7qjhd3NzkNyhnR7owjW9dI4gHXTSgrEIyG5UO2IZU5imDx PvaZEBVi14bOveJYdbVoOUzV4M5jXLZGmYtrZTCA1iJTcYQIt567qynE/Zz7t2cpsi aFPBE3ovxYLz+hcA3BBbKqlJPJaaUiUaG+ju51lU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732720AbgJAOCD (ORCPT ); Thu, 1 Oct 2020 10:02:03 -0400 Received: from mail-ot1-f68.google.com ([209.85.210.68]:46815 "EHLO mail-ot1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732632AbgJAOB1 (ORCPT ); Thu, 1 Oct 2020 10:01:27 -0400 Received: by mail-ot1-f68.google.com with SMTP id a13so2676122otl.13 for ; Thu, 01 Oct 2020 07:01:26 -0700 (PDT) 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=/npTokW0/caRR52NC7zd+V6Q4Uga9BFc73EKnUd7cho=; b=bBvECyMBRNamAwnjUKTUu/gIrqDUYJKk1q+KumGAtPce2V65OIDRxlOF9qa8qgFNKF 8OapyiV4wnr4e3pvlxJfmLil8vw1F+ZnQUTJNzFSj3LooLFEiIPX7xpoLUvbvU4Dq4R5 CC1D6L4r+l48oLUbT/lfQQfEC8nU/s8J9xo6UEcjLijn8P+jJATafRgOOPp6NpXcFt2X rtxOV7o+6LdKiMKjsBmc7//groMQaW3awlOZwcC9yF0QWxbxi831ZtE/mT5i1GSqZoYg 1aB+Xu3Ej75dDgsuj+Y1hGVGVH24VjD3RS5noBvjakgtH+7PJb2MGbn60oc9fhga7Jc9 LdPw== X-Gm-Message-State: AOAM533wRAAwM7ztmGi48Y4w5rssUJTpXkyxbsTxFyf3AAzX4Se9y7mz 1AUYLxgvIlgY4GZeiHJ0jA== X-Google-Smtp-Source: ABdhPJxJBkZBco9Qa/bX2tedPYCvjfy86ofpmd58m1GO6pBVydjIpwBnC0EnwuLCT+ylwO42rpwMLg== X-Received: by 2002:a9d:65c8:: with SMTP id z8mr4886311oth.5.1601560886509; Thu, 01 Oct 2020 07:01:26 -0700 (PDT) Received: from xps15.herring.priv (24-155-109-49.dyn.grandenetworks.net. [24.155.109.49]) by smtp.googlemail.com with ESMTPSA id q81sm1032138oia.46.2020.10.01.07.01.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Oct 2020 07:01:25 -0700 (PDT) From: Rob Herring To: Will Deacon , Catalin Marinas , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Jiri Olsa Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Alexander Shishkin , Namhyung Kim , Raphael Gault , Mark Rutland , Jonathan Cameron , Ian Rogers , honnappa.nagarahalli@arm.com, Itaru Kitayama Subject: [PATCH v4 5/9] libperf: tests: Add support for verbose printing Date: Thu, 1 Oct 2020 09:01:12 -0500 Message-Id: <20201001140116.651970-6-robh@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201001140116.651970-1-robh@kernel.org> References: <20201001140116.651970-1-robh@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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 --- v3: - New patch --- tools/lib/perf/include/internal/tests.h | 32 +++++++++++++++++++++++++ tools/lib/perf/tests/Makefile | 4 +++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/tools/lib/perf/include/internal/tests.h b/tools/lib/perf/include/internal/tests.h index 2093e8868a67..27b6e64299e2 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) +{ + char 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..9438b385d489 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) @@ -30,7 +32,7 @@ run: @echo "running static:" @for i in $(TESTS_A); do ./$$i; 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.25.1