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,URIBL_BLOCKED,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 9BDACC32750 for ; Fri, 2 Aug 2019 21:11:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6E1FF206A3 for ; Fri, 2 Aug 2019 21:11:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="DlMTuoin" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731173AbfHBVLM (ORCPT ); Fri, 2 Aug 2019 17:11:12 -0400 Received: from mail-pf1-f202.google.com ([209.85.210.202]:53762 "EHLO mail-pf1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726177AbfHBVLM (ORCPT ); Fri, 2 Aug 2019 17:11:12 -0400 Received: by mail-pf1-f202.google.com with SMTP id 191so49029099pfy.20 for ; Fri, 02 Aug 2019 14:11:12 -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=3dxbmYEhw+rCqvWay2j/TQjWw8okzeOVx0ueDyRuULg=; b=DlMTuoinxcf6KR/pUJT8KazzJhslqNfKEynU9O45xbs1K0yojtRwXbMzEts/u+ifJJ UbGAel/s7cK8TmxYxbE46egVs2AXs7LD/Vy8Zz/ah8ABFuqeg3+xnv5tkYv/0dyXrqs/ wsnj1faq9+fXKezYgDT7Iw17m2PDL3G0D2vyHQYCOgwjGAn1hOlWenu6cSmAyQKOClzt lx0cz5irsgHhBXXGjsq7nF+W/k/Xd9Y05wlu86Bh7VH5evAfxMn/K1ajdjpv0+48nKgb iQaAUiHBvYQh6gHt/rLwXGhs9agYf+5/ncL09aH+RzblkjbiJcP4uG4rpJgUGwZaxpka DQtw== 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=3dxbmYEhw+rCqvWay2j/TQjWw8okzeOVx0ueDyRuULg=; b=kBEQZ6a5IpC4+d21/sxGuxSu5QCYTSLeHMfaH+BaOVD8Hi0XDIjXpgbVtXd7Xa/ZEl QLII/XsasYnOEA+lFzT9K1r3RLLvsEVBo8Q0wwQF3peAVaf9t4PS3WhOrk0zTHyIrRJK i30UG0usRLrL749GVEC5/7LLFcu5WmcLBR6drUVwMayUPPxnGIRH8WfCyLG9bgRBHv4w j9WkJpc/mNanCAJeFlu0XlBuiWEVH1pLHMcrH2f4h3qY2EVMGhdX14Bl7S5Vmme9Xgsu FMWsKFuUf59RGGMyOR3UT3MRbGZ/PgbvTg+U1izu/A8883qFJTGL+0K4NIijnkB/sGc1 YYkw== X-Gm-Message-State: APjAAAXzujZzD8QusunhZdrO6w5qSaHsjHIc/fbXYFyw9P4B5LIdtHdb Gb/2AjNFvmgMVyIOnEhdoRJV5iZ0QtRgBq+XTgeNnKEfv2UvglC5fzyTRW/hgcFs8q48L2pkTaT /wAyFI9YyuCs6uCXPN+34foDqfMZfcIE+/AmfsA7prVs+2Otq/ncL1Q== X-Google-Smtp-Source: APXvYqxAWopCpPz0eVit3/wNRDfqL+5YCKxF8IAaNmhn2xw+CGiBnZ89nrcFse8WxRhYEmW6e2o5Acc= X-Received: by 2002:a65:620a:: with SMTP id d10mr79714806pgv.8.1564780271226; Fri, 02 Aug 2019 14:11:11 -0700 (PDT) Date: Fri, 2 Aug 2019 14:11:05 -0700 Message-Id: <20190802211108.90739-1-sdf@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.22.0.770.g0f2c4a37fd-goog Subject: [PATCH bpf-next v2 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 | 140 +++++++++--------- tools/testing/selftests/bpf/test_progs.h | 14 +- 10 files changed, 90 insertions(+), 98 deletions(-) -- 2.22.0.770.g0f2c4a37fd-goog