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=-11.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=no 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 8EB04C0650F for ; Mon, 5 Aug 2019 15:40:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5B4AF216F4 for ; Mon, 5 Aug 2019 15:40:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="bynFntyD" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728830AbfHEPk6 (ORCPT ); Mon, 5 Aug 2019 11:40:58 -0400 Received: from mail-pg1-f201.google.com ([209.85.215.201]:49387 "EHLO mail-pg1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728735AbfHEPk6 (ORCPT ); Mon, 5 Aug 2019 11:40:58 -0400 Received: by mail-pg1-f201.google.com with SMTP id 30so52908700pgk.16 for ; Mon, 05 Aug 2019 08:40:57 -0700 (PDT) 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=2x05NJzRBxAgvVOllXn3alCW8vnfUBvAPstMLvDWM7c=; b=bynFntyDG6vxmRv17Ri6M/YvC9mMVLd0Vnc0lVnk9eTvbPzMeXulY55RiWJuUXhOKL 40l4rOrT7s4bAXBYQFFQ6w3M944K3IE1fT4Gd8TmZC3/IDoghhKobvPuDhuGneC4jR/V MN2yUwA4Nj24rnikNurWSX0wod/+fQZ9OlGXtEAiNutWYE7vwFakIUIDPsrYkag+YBrK C0tyUAc5ehdzYmGuu06IRw1sdQYEqo5wY4wNJCEbDrrXt/XLrr/nw+WD7mY4l10OU65y r29IedxX1zf9s1ArKbn2VBOoc3vm+qRnrFhukD0x+v35U4M9M5lLJEnTl48NJKDRZ4pP lmRQ== 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=2x05NJzRBxAgvVOllXn3alCW8vnfUBvAPstMLvDWM7c=; b=hVtnx0EoY9Y5P3yZ/MOtKSGDvp6zPlTjpKsAeS2DrSBv11YSzyJVWrNh62WYjdOboS ZoBrxScA86p3ZCR5UP6NAovmP+do7L8S3skr5HRiD+sxkTbX/ogGjBVISTwCij0GkYz0 ayo0HSjtOaR34tIyJ9eFeRHeiUa64O3A39NymEwfyt6d7tkdbynkc5fMTDupJFvBSJDk xsKKfCH4XCPPfxd4GYxUwUX05UJjOxlBXY1nf6fV4uMHXpYFZsnuFIsW2UjVHIfXMeSc TlVPou7eUaF7DyRMg1xRL13EWZEb1XmM2Y7NBfDOc9Nv8qx/alzgY5v8y1Io9EycdULA 8yvg== X-Gm-Message-State: APjAAAUlrna6eIO9UtDmQe21usCqyk19CyjJx810YDMgwOMn/D7CQPMc +WtNrAX1OkzJGntYVRjJ4KewUsDpo/ovgtq4xyGMeja/VX+y+4VsKuwbfn2dV1fNFoexs0iet5e R/GvlduGNFc9av9LKyRUw8TqqH+aeRmUrXi3lT81KhRF7hvSARP+TGw== X-Google-Smtp-Source: APXvYqx5AcurOPux+I93ieBh5a1gzf/6tIOd0gaZs5dHC3TkcW2NvbgH7ooO3UQzsd8/Lfs7Gxbzmis= X-Received: by 2002:a63:1046:: with SMTP id 6mr140549546pgq.111.1565019657053; Mon, 05 Aug 2019 08:40:57 -0700 (PDT) Date: Mon, 5 Aug 2019 08:40:52 -0700 Message-Id: <20190805154055.197664-1-sdf@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.22.0.770.g0f2c4a37fd-goog Subject: [PATCH bpf-next v3 0/3] selftests/bpf: switch test_progs back to stdio 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 Content-Type: text/plain; charset="UTF-8" Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org I was looking into converting test_sockops* to test_progs framework and that requires using cgroup_helpers.c which rely on stdio/stderr. Let's use open_memstream to override stdout into buffer during subtests instead of custom test_{v,}printf wrappers. That lets us continue to use stdio in the subtests and dump it on failure if required. That would also fix bpf_find_map which currently uses printf to signal failure (missed during test_printf conversion). Cc: Andrii Nakryiko Stanislav Fomichev (3): selftests/bpf: test_progs: switch to open_memstream selftests/bpf: test_progs: test__printf -> printf selftests/bpf: test_progs: drop extra trailing tab .../bpf/prog_tests/bpf_verif_scale.c | 4 +- .../selftests/bpf/prog_tests/l4lb_all.c | 2 +- .../selftests/bpf/prog_tests/map_lock.c | 10 +- .../selftests/bpf/prog_tests/send_signal.c | 4 +- .../selftests/bpf/prog_tests/spinlock.c | 2 +- .../bpf/prog_tests/stacktrace_build_id.c | 4 +- .../bpf/prog_tests/stacktrace_build_id_nmi.c | 4 +- .../selftests/bpf/prog_tests/xdp_noinline.c | 4 +- tools/testing/selftests/bpf/test_progs.c | 131 ++++++++---------- tools/testing/selftests/bpf/test_progs.h | 12 +- 10 files changed, 83 insertions(+), 94 deletions(-) -- 2.22.0.770.g0f2c4a37fd-goog