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 28A9AC433F5 for ; Thu, 4 Nov 2021 06:45:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0D3EF60ED5 for ; Thu, 4 Nov 2021 06:45:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230492AbhKDGsT (ORCPT ); Thu, 4 Nov 2021 02:48:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50910 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231280AbhKDGr0 (ORCPT ); Thu, 4 Nov 2021 02:47:26 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 89D60C061228 for ; Wed, 3 Nov 2021 23:43:09 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id b5-20020a25a205000000b005c2150fc181so7469751ybi.6 for ; Wed, 03 Nov 2021 23:43:09 -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=o4TRPJyhBO0SX+FkafcxEBVvusZQbgZV2Z4RZH79KhQ=; b=Kr9fCVtW1JNevX1WKHUwKJNEo81y0QYkdWYv8eXxGrcsL0cYQfHwjo8N17GuIDkhlf 5mfYFmbNMjms7TZMRqYQGIKoy2COh1LJW9Q5BRktAj58H0YqUdigdDa1e+3XARIxX8dL bGVxrOQpfZNSK2bJ6GYnnuGwY0D49iVu3PJwqOuybNs21icyLcluw4vOsjfjdXbMBMD0 P92AvfKPIuzI825CTOtAvI0OucSGOdBp9lUOySYXFrSweG3Ovuv0oPoaBSJZ3Ut3xOxC sg9In9gYRVDN7WYi3qJz9lhc8hb3vYvd8/X9Z1gXax/hauvCwOBKZR+JYCN+9tck8tse rZkA== 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=o4TRPJyhBO0SX+FkafcxEBVvusZQbgZV2Z4RZH79KhQ=; b=hDAh6lgO5QY9sbaoCYjv7nsPy3vkM/3RULkF16obdr4gA/LtlenQ2j0+837d2jLWDS y8L7sFH4YFJ8/XsR46PtcqaGfBeeHrqvHsbFYai6SSbgIMk1KeQEyRhDj2Ez2hPg1A7S 7+WeeI675kEXMKnSOC+gIqFsYf32gZBN+V1UuYEbzJl/SHw5Mt8LZQW19zdSI+32IPka 2sA8h4hG0zncskOPvrDr2tBJrBxhLr0jcU6WL7xfzdf+Lu+yaW8P+LgS/AOzlijW+5rq +Eo0iuPHUUFz7aU/fZkQQJ0d8raa+g5hf827jWE58CYVc2xXRSZjct4GEBUY05XOlk8R JJfA== X-Gm-Message-State: AOAM531/y3phJdZbEgDdXNW5/D39wT+KylmCyKZOyIc9o8Cb4uvEeDFH 6JA2NDwvWKv3uTqSqUT3fxPQsGCYjTuE X-Google-Smtp-Source: ABdhPJyJbyEpnkxl8BA1bCgtCAQwNr/jaO4Wr6jLJV+hT5Mphu1twJ41di3wPKvbeeQa7AKQFdIGtNUZLap+ X-Received: from irogers.svl.corp.google.com ([2620:15c:2cd:202:8ce:af84:2510:3f29]) (user=irogers job=sendgmr) by 2002:a25:645:: with SMTP id 66mr54545583ybg.150.1636008188827; Wed, 03 Nov 2021 23:43:08 -0700 (PDT) Date: Wed, 3 Nov 2021 23:42:08 -0700 In-Reply-To: <20211104064208.3156807-1-irogers@google.com> Message-Id: <20211104064208.3156807-23-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 22/22] perf test: Remove skip_if_fail 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 Remove optionality, always run tests in a suite even if one fails. This brings perf's test more inline with kunit that lacks this notion. Signed-off-by: Ian Rogers --- tools/perf/tests/bpf.c | 1 - tools/perf/tests/builtin-test.c | 24 ++++++++---------------- tools/perf/tests/clang.c | 1 - tools/perf/tests/llvm.c | 1 - tools/perf/tests/pfm.c | 1 - tools/perf/tests/tests.h | 3 --- 6 files changed, 8 insertions(+), 23 deletions(-) diff --git a/tools/perf/tests/bpf.c b/tools/perf/tests/bpf.c index e86a77ce93ef..c3d6eda8601e 100644 --- a/tools/perf/tests/bpf.c +++ b/tools/perf/tests/bpf.c @@ -382,5 +382,4 @@ static struct test_case bpf_tests[] = { struct test_suite suite__bpf = { .desc = "BPF filter", .test_cases = bpf_tests, - .subtest = { .skip_if_fail = true, }, }; diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c index 19b1228dbd5d..8cb5a1c3489e 100644 --- a/tools/perf/tests/builtin-test.c +++ b/tools/perf/tests/builtin-test.c @@ -238,18 +238,13 @@ static int run_test(struct test_suite *test, int subtest) for (j = 0; j < ARRAY_SIZE(tests); j++) \ for (k = 0, t = tests[j][k]; tests[j][k]; k++, t = tests[j][k]) -static int test_and_print(struct test_suite *t, bool force_skip, int subtest) +static int test_and_print(struct test_suite *t, int subtest) { int err; - if (!force_skip) { - pr_debug("\n--- start ---\n"); - err = run_test(t, subtest); - pr_debug("---- end ----\n"); - } else { - pr_debug("\n--- force skipped ---\n"); - err = TEST_SKIP; - } + pr_debug("\n--- start ---\n"); + err = run_test(t, subtest); + pr_debug("---- end ----\n"); if (!has_subtests(t)) pr_debug("%s:", t->desc); @@ -432,7 +427,7 @@ static int run_shell_tests(int argc, const char *argv[], int i, int width, continue; } - test_and_print(&test_suite, false, 0); + test_and_print(&test_suite, 0); } for (e = 0; e < n_dirs; e++) @@ -456,7 +451,7 @@ static int __cmd_test(int argc, const char *argv[], struct intlist *skiplist) } for_each_test(j, k, t) { - int curr = i++, err; + int curr = i++; int subi; if (!perf_test__matches(test_description(t, -1), curr, argc, argv)) { @@ -483,7 +478,7 @@ static int __cmd_test(int argc, const char *argv[], struct intlist *skiplist) } if (!has_subtests(t)) { - test_and_print(t, false, -1); + test_and_print(t, -1); } else { int subn = num_subtests(t); /* @@ -495,7 +490,6 @@ static int __cmd_test(int argc, const char *argv[], struct intlist *skiplist) * 35.1: Basic BPF llvm compiling test : Ok */ int subw = width > 2 ? width - 2 : width; - bool skip = false; if (subn <= 0) { color_fprintf(stderr, PERF_COLOR_YELLOW, @@ -518,9 +512,7 @@ static int __cmd_test(int argc, const char *argv[], struct intlist *skiplist) pr_info("%2d.%1d: %-*s:", i, subi + 1, subw, test_description(t, subi)); - err = test_and_print(t, skip, subi); - if (err != TEST_OK && t->subtest.skip_if_fail) - skip = true; + test_and_print(t, subi); } } } diff --git a/tools/perf/tests/clang.c b/tools/perf/tests/clang.c index ba06a2257574..a7111005d5b9 100644 --- a/tools/perf/tests/clang.c +++ b/tools/perf/tests/clang.c @@ -29,5 +29,4 @@ static struct test_case clang_tests[] = { struct test_suite suite__clang = { .desc = "builtin clang support", .test_cases = clang_tests, - .subtest = { .skip_if_fail = true, }, }; diff --git a/tools/perf/tests/llvm.c b/tools/perf/tests/llvm.c index f27ef00d65e9..8ac0a3a457ef 100644 --- a/tools/perf/tests/llvm.c +++ b/tools/perf/tests/llvm.c @@ -216,5 +216,4 @@ static struct test_case llvm_tests[] = { struct test_suite suite__llvm = { .desc = "LLVM search and compile", .test_cases = llvm_tests, - .subtest = { .skip_if_fail = true, }, }; diff --git a/tools/perf/tests/pfm.c b/tools/perf/tests/pfm.c index 651fee4ef819..71b76deb1f92 100644 --- a/tools/perf/tests/pfm.c +++ b/tools/perf/tests/pfm.c @@ -191,5 +191,4 @@ static struct test_case pfm_tests[] = { struct test_suite suite__pfm = { .desc = "Test libpfm4 support", .test_cases = pfm_tests, - .subtest = { .skip_if_fail = true } }; diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h index 15051801c790..8f65098110fc 100644 --- a/tools/perf/tests/tests.h +++ b/tools/perf/tests/tests.h @@ -40,9 +40,6 @@ struct test_case { struct test_suite { const char *desc; - struct { - bool skip_if_fail; - } subtest; struct test_case *test_cases; void *priv; }; -- 2.33.1.1089.g2158813163f-goog