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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 22431C433F5 for ; Thu, 4 Nov 2021 06:45:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 069C361056 for ; Thu, 4 Nov 2021 06:45:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231205AbhKDGrl (ORCPT ); Thu, 4 Nov 2021 02:47:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50948 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231598AbhKDGqA (ORCPT ); Thu, 4 Nov 2021 02:46:00 -0400 Received: from mail-qv1-xf49.google.com (mail-qv1-xf49.google.com [IPv6:2607:f8b0:4864:20::f49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6F9C1C079786 for ; Wed, 3 Nov 2021 23:42:52 -0700 (PDT) Received: by mail-qv1-xf49.google.com with SMTP id h14-20020a0562140dae00b003ae664126e9so4878971qvh.3 for ; Wed, 03 Nov 2021 23:42:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=uhMKrCNfPxQ2Zcf5Vkl+HNKM9vie+osD+kw0v1/wntc=; b=fRD6pPnhXQjYDgk64XZQYo4g3gb7eA/+1u37deVGGWIAbtp9nAGrA+hajH3CUuaWu0 Im8k2jipHGJl49zo1qi4RTg2sQMqKo//rfdgSo8etlrlmKSBhcUKI226CGUargNt3EGc 8edyLdQwEsIPVkKkd6Jh58N9l4PhuNqhFv325rboL4zKR2mtyo/gr/R52fWAVC/DPw95 zsrBnYhIEys7E/ZakY9PDvtQ05e5poqXQ6zVXofgqLBU7TxwAapHy+cPqfg7Y7UG0sHQ rOCc/z0FncROnfJ7OTke6XEcLA5+ZJsoO6+17NdJN/f57/gE6ftXsGRohfKiySWsRWKH HuQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=uhMKrCNfPxQ2Zcf5Vkl+HNKM9vie+osD+kw0v1/wntc=; b=3OBQ1O2cYcp0yaStw/JtE5RlA2hwzla4QkGEzIgQsmPL2Ph3aATKCRPtQBD6Z99dKU XlSvsBN9+NetAKhVJrYAZjHaSl9X5JbUC0KWV9106tyo8s68GyKZH7GNJkJytzk93nwO fmba6Pu1aEBgSXQjOuDWhYH40YCszkfwoR9StZ+fgTtKFtHNy/L+jp2yd0BwAl/NkhPM CSHctGTsuFV49nMBl8en19F/uVU/IyZNiV81rpUkJGggdvbEAwDi3mG8lXq7CpSYBnjk suOEIkSB1wcqVzUWb/bduI25LjnRRJol4yPrWIXDrKQ8Osyyiqvc0tyu2725KHid98R4 Hv/A== X-Gm-Message-State: AOAM530iJvCnXLp+9+gkgIGxAFX1+GmxyUFPHUFba7YdfAZEl8B0CNWC LnmpaTSgCG2v05XvyRwtoU2v7lfLVBD+ X-Google-Smtp-Source: ABdhPJwaj3qyP2mK2LcR/ElV51GawChsbXR3N0ewLz5rH02YbJX34yU3SyyaJ6tuw2uTlabymcCkRIZmMtyv X-Received: from irogers.svl.corp.google.com ([2620:15c:2cd:202:8ce:af84:2510:3f29]) (user=irogers job=sendgmr) by 2002:a05:622a:50b:: with SMTP id l11mr51313937qtx.415.1636008171638; Wed, 03 Nov 2021 23:42:51 -0700 (PDT) Date: Wed, 3 Nov 2021 23:42:01 -0700 In-Reply-To: <20211104064208.3156807-1-irogers@google.com> Message-Id: <20211104064208.3156807-16-irogers@google.com> Mime-Version: 1.0 References: <20211104064208.3156807-1-irogers@google.com> X-Mailer: git-send-email 2.33.1.1089.g2158813163f-goog Subject: [PATCH v3 15/22] perf test: Remove now unused subtest helpers From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Jin Yao , John Garry , "Paul A . Clarke" , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Brendan Higgins , Daniel Latypov , David Gow , Sohaib Mohamed Cc: eranian@google.com, Ian Rogers Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Replaced by null terminated test case array. Signed-off-by: Ian Rogers --- tools/perf/tests/builtin-test.c | 11 +---------- tools/perf/tests/tests.h | 3 --- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c index db76d7d10749..62e97faa90f0 100644 --- a/tools/perf/tests/builtin-test.c +++ b/tools/perf/tests/builtin-test.c @@ -119,9 +119,6 @@ static int num_subtests(const struct test_suite *t) { int num; - if (t->subtest.get_nr) - return t->subtest.get_nr(); - if (!t->test_cases) return 0; @@ -134,14 +131,11 @@ static int num_subtests(const struct test_suite *t) static bool has_subtests(const struct test_suite *t) { - return t->subtest.get_nr || num_subtests(t) > 1; + return num_subtests(t) > 1; } static const char *skip_reason(const struct test_suite *t, int subtest) { - if (t->subtest.skip_reason) - return t->subtest.skip_reason(subtest); - if (t->test_cases && subtest >= 0) return t->test_cases[subtest].skip_reason; @@ -153,9 +147,6 @@ static const char *test_description(const struct test_suite *t, int subtest) if (t->test_cases && subtest >= 0) return t->test_cases[subtest].desc; - if (t->subtest.get_desc && subtest >= 0) - return t->subtest.get_desc(subtest); - return t->desc; } diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h index f87129b63d92..9bf448f7429a 100644 --- a/tools/perf/tests/tests.h +++ b/tools/perf/tests/tests.h @@ -43,9 +43,6 @@ struct test_suite { test_fnptr func; struct { bool skip_if_fail; - int (*get_nr)(void); - const char *(*get_desc)(int subtest); - const char *(*skip_reason)(int subtest); } subtest; struct test_case *test_cases; bool (*is_supported)(void); -- 2.33.1.1089.g2158813163f-goog