From patchwork Wed Aug 14 16:47:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislav Fomichev X-Patchwork-Id: 1147125 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="en9obOKI"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 467wVw4RfPz9sBF for ; Thu, 15 Aug 2019 02:47:52 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728315AbfHNQrv (ORCPT ); Wed, 14 Aug 2019 12:47:51 -0400 Received: from mail-pl1-f202.google.com ([209.85.214.202]:45953 "EHLO mail-pl1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728300AbfHNQru (ORCPT ); Wed, 14 Aug 2019 12:47:50 -0400 Received: by mail-pl1-f202.google.com with SMTP id y9so65001937plp.12 for ; Wed, 14 Aug 2019 09:47:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=T3//wE3HCI/3ByfInvNbN4Ma41u+RbtVje+WMKN729w=; b=en9obOKIccXCwCjYzLjp93zzqZU3fkVuuEkHXQ5mpGdDv4enslXVD6D63bWjddCwi+ gjM31NVpn+KLU0BvGLyDn+p23Kuv/QlPTIS+s8J8AtTMP7lsiFQ3ZmiQWe9Zv1Mwypnz ej8NbW2ZPxae1ugsXxJBENJglJ0tyIraMlT5ghri5tv8etYkA0+HKTC9LZPMaCLCEFiH LLOexEtJoXc3M9RQr2n6mOwI8LzmX1eSyXGspZURPb3QfJGNOQfzemfqpinuanYAbubV pd3GYOEWxeRatu6h4yO4t/M3xaKdz01GHRl4kH8bzFTqm/8FayBBorId0Z9K9U35awMx wm/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=T3//wE3HCI/3ByfInvNbN4Ma41u+RbtVje+WMKN729w=; b=dpbKdDd+Szi06J7zgcmMgkAl1lY3mKjsc/ZtJzylqahqZ1hxtViReV4LKjVHM1nUD8 gj/aehSf6z79HDqB3uDh8OS4wvimVWrNIlPegjgXc1/AHTdjcFUejKYPOV2bi3w3P31w Oj2DTPdmYAuCSx9mseUy9ekt2d/us2vsBpmd8Icg8oIqQCK9qMSPbgtYO0TM/b4ySdYm hrj/eLOdQHBlvqp3mRQ5VkD6xvWuLuUqsWVxBC81u0ciYBTJUU/8/Ys5ABqKEAgtnBTc cZftC9iGf7MYvq8hChKEUvZGoscgEzvSvJ+LLAwV6TrznM9tGneYW4J9uI7pGiwtbug0 3wqg== X-Gm-Message-State: APjAAAUNhGUek34BKeU8xCbKPOHIYtnTipA0zutDXHiIG3Qr4anrj4kI SN+f9pddzfC9T8li0/e88WST7uHeO+O7FQEHj4j/o5lBtz616Jz60Abqgb5YY2lp7ZUwiPPKqR1 vn8oovh/6HHd6B9xYQoxDJnZfA3c2LOakHWULelDLAXca18EE5RacVA== X-Google-Smtp-Source: APXvYqyKnKDNaE/IxQz4eQzJ/gmghPay55SJB71zxyR0DG0Az85ks7MQXx6ZszIu60HcDXVuDXy+8gg= X-Received: by 2002:a63:5c7:: with SMTP id 190mr101082pgf.67.1565801269487; Wed, 14 Aug 2019 09:47:49 -0700 (PDT) Date: Wed, 14 Aug 2019 09:47:40 -0700 In-Reply-To: <20190814164742.208909-1-sdf@google.com> Message-Id: <20190814164742.208909-3-sdf@google.com> Mime-Version: 1.0 References: <20190814164742.208909-1-sdf@google.com> X-Mailer: git-send-email 2.23.0.rc1.153.gdeed80330f-goog Subject: [PATCH bpf-next 2/4] selftests/bpf: test_progs: test__skip From: Stanislav Fomichev To: netdev@vger.kernel.org, bpf@vger.kernel.org Cc: davem@davemloft.net, ast@kernel.org, daniel@iogearbox.net, Stanislav Fomichev , Andrii Nakryiko Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Export test__skip() to indicate skipped tests and use it in test_send_signal_nmi(). Cc: Andrii Nakryiko Signed-off-by: Stanislav Fomichev Acked-by: Andrii Nakryiko --- tools/testing/selftests/bpf/prog_tests/send_signal.c | 1 + tools/testing/selftests/bpf/test_progs.c | 9 +++++++-- tools/testing/selftests/bpf/test_progs.h | 2 ++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/send_signal.c b/tools/testing/selftests/bpf/prog_tests/send_signal.c index 1575f0a1f586..40c2c5efdd3e 100644 --- a/tools/testing/selftests/bpf/prog_tests/send_signal.c +++ b/tools/testing/selftests/bpf/prog_tests/send_signal.c @@ -204,6 +204,7 @@ static int test_send_signal_nmi(void) if (errno == ENOENT) { printf("%s:SKIP:no PERF_COUNT_HW_CPU_CYCLES\n", __func__); + test__skip(); return 0; } /* Let the test fail with a more informative message */ diff --git a/tools/testing/selftests/bpf/test_progs.c b/tools/testing/selftests/bpf/test_progs.c index 1a7a2a0c0a11..1993f2ce0d23 100644 --- a/tools/testing/selftests/bpf/test_progs.c +++ b/tools/testing/selftests/bpf/test_progs.c @@ -121,6 +121,11 @@ void test__force_log() { env.test->force_log = true; } +void test__skip(void) +{ + env.skip_cnt++; +} + struct ipv4_packet pkt_v4 = { .eth.h_proto = __bpf_constant_htons(ETH_P_IP), .iph.ihl = 5, @@ -535,8 +540,8 @@ int main(int argc, char **argv) test->test_name); } stdio_restore(); - printf("Summary: %d/%d PASSED, %d FAILED\n", - env.succ_cnt, env.sub_succ_cnt, env.fail_cnt); + printf("Summary: %d/%d PASSED, %d SKIPPED, %d FAILED\n", + env.succ_cnt, env.sub_succ_cnt, env.skip_cnt, env.fail_cnt); free(env.test_selector.num_set); free(env.subtest_selector.num_set); diff --git a/tools/testing/selftests/bpf/test_progs.h b/tools/testing/selftests/bpf/test_progs.h index 37d427f5a1e5..9defd35cb6c0 100644 --- a/tools/testing/selftests/bpf/test_progs.h +++ b/tools/testing/selftests/bpf/test_progs.h @@ -64,6 +64,7 @@ struct test_env { int succ_cnt; /* successful tests */ int sub_succ_cnt; /* successful sub-tests */ int fail_cnt; /* total failed tests + sub-tests */ + int skip_cnt; /* skipped tests */ }; extern int error_cnt; @@ -72,6 +73,7 @@ extern struct test_env env; extern void test__force_log(); extern bool test__start_subtest(const char *name); +extern void test__skip(void); #define MAGIC_BYTES 123