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.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT, USER_IN_DEF_DKIM_WL autolearn=unavailable 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 3EA6FC33CB6 for ; Sat, 18 Jan 2020 01:05:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1456021D56 for ; Sat, 18 Jan 2020 01:05:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Mqa+GIog" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729102AbgARBFu (ORCPT ); Fri, 17 Jan 2020 20:05:50 -0500 Received: from mail-vs1-f74.google.com ([209.85.217.74]:38444 "EHLO mail-vs1-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728778AbgARBFu (ORCPT ); Fri, 17 Jan 2020 20:05:50 -0500 Received: by mail-vs1-f74.google.com with SMTP id o185so2529144vsc.5 for ; Fri, 17 Jan 2020 17:05:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=h6UZKEGdiRrN83ws0HUMDIaa+g3hnaxBrJoxeBmwwDE=; b=Mqa+GIogWftqv0rXcHjdMD7tacWdZVv08hgfuWoWgOtkku2JFwEJ/bY6Y+brh5ivUD Xd4OU8IVWEKnsf/RN6IUNJMWVVxPrBpCbW67rduGi87B3IiBP6oHN275OPPLJFyppktO +oYzmZ4doRIC8g/Q2hOkILQyBD98bKuGCaUlIPwwsjZslya5hHTWCnUgH9ATeleRGOrB YMCHURy8DRTillA4A3TupVDf/Y4sIF5fZzfubQn4g/KBBgQCg2Hh4y+dtrJhmAmay/xN Dn0cBYvdW19hkJEwKdf2v3DcbL6KhA8b4q9OyTV50odnSk4Pxy0k+JZ66GGF614aVZef iGOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=h6UZKEGdiRrN83ws0HUMDIaa+g3hnaxBrJoxeBmwwDE=; b=VO4Xc0w7ntRG2MDQJ8ysghQhZglL+PWrmiEBKqEKbTNFqtqd03d+o4kgWzLF393YYT YR/3om/wnCsiEBgYLPN7L11QTym2rgPc+udkpEwnwAQB2y/VQXlfau8k/SDWu0YCqW+q qM+fnbVWzcsjnjw0T+oEHBNh/D0yrgmdSqqjt9g76/n5zmB1usR40ChW2+arDUXxDu6s 4IKrK/TOTRklID986fROCLktJTPIsfluviP9FpBVvNFgbU51fZB9oNCVPWcyRLjnfMEz KIMG3qgc0gROGeIB94UWr5kTUL44o5O2EUBT84eIaJNq+tcJtY7tU4wbXk+pyZafTKVp ydGw== X-Gm-Message-State: APjAAAWrGa/3EoVg6J5uNOz5SYf4rIL8HFbqqp1r+OtO+J/Mrrw/s++W vrhpVhAYNC6HxeeLNz1hmA9LzsdZoeskG01RJ6i8NNd89U/rhExmNyqpxclWqvZvgu/8rKkov1H ihcHVQu7Mqf2upC2FC6vyY1mtU9QbeGR7PYNCeqChBcRr79kT1W4Ukg== X-Google-Smtp-Source: APXvYqwegHDLxEN8dlTlm36QG9n4noUGaV8D7tdqv+KHgBxvPQ5tU4Qyf8clAtORan9eTdPpIB/VjoA= X-Received: by 2002:a1f:8f44:: with SMTP id r65mr4070061vkd.8.1579309549321; Fri, 17 Jan 2020 17:05:49 -0800 (PST) Date: Fri, 17 Jan 2020 17:05:46 -0800 Message-Id: <20200118010546.74279-1-sdf@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.25.0.341.g760bfbb309-goog Subject: [PATCH bpf-next] selftests/bpf: don't check for btf fd in test_btf From: Stanislav Fomichev To: netdev@vger.kernel.org, bpf@vger.kernel.org Cc: davem@davemloft.net, ast@kernel.org, daniel@iogearbox.net, Stanislav Fomichev Content-Type: text/plain; charset="UTF-8" Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org After commit 0d13bfce023a ("libbpf: Don't require root for bpf_object__open()") we no longer load BTF during bpf_object__open(), so let's remove the expectation from test_btf that the fd is not -1. The test currently fails. Before: BTF libbpf test[1] (test_btf_haskv.o): do_test_file:4152:FAIL bpf_object__btf_fd: -1 BTF libbpf test[2] (test_btf_newkv.o): do_test_file:4152:FAIL bpf_object__btf_fd: -1 BTF libbpf test[3] (test_btf_nokv.o): do_test_file:4152:FAIL bpf_object__btf_fd: -1 After: BTF libbpf test[1] (test_btf_haskv.o): OK BTF libbpf test[2] (test_btf_newkv.o): OK BTF libbpf test[3] (test_btf_nokv.o): OK Fixes: 0d13bfce023a ("libbpf: Don't require root forbpf_object__open()") Signed-off-by: Stanislav Fomichev --- tools/testing/selftests/bpf/test_btf.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tools/testing/selftests/bpf/test_btf.c b/tools/testing/selftests/bpf/test_btf.c index 3d617e806054..93040ca83e60 100644 --- a/tools/testing/selftests/bpf/test_btf.c +++ b/tools/testing/selftests/bpf/test_btf.c @@ -4148,10 +4148,6 @@ static int do_test_file(unsigned int test_num) if (CHECK(IS_ERR(obj), "obj: %ld", PTR_ERR(obj))) return PTR_ERR(obj); - err = bpf_object__btf_fd(obj); - if (CHECK(err == -1, "bpf_object__btf_fd: -1")) - goto done; - prog = bpf_program__next(NULL, obj); if (CHECK(!prog, "Cannot find bpf_prog")) { err = -1; -- 2.25.0.341.g760bfbb309-goog