From patchwork Thu Jan 25 16:05:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= X-Patchwork-Id: 192154 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:e09d:b0:103:945f:af90 with SMTP id gm29csp77377dyb; Thu, 25 Jan 2024 08:06:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IGcuipKHVLb7GgtAVkS9jo0MExPm4DRlnslmOwc63BOuxrcLXwo+fQ6JJ2QFP/E2ov/si4H X-Received: by 2002:a05:6a20:7d86:b0:19c:4ebc:126d with SMTP id v6-20020a056a207d8600b0019c4ebc126dmr1194632pzj.52.1706198801183; Thu, 25 Jan 2024 08:06:41 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706198801; cv=pass; d=google.com; s=arc-20160816; b=YOShTJz6ChF/VOz8sqfiA5c3cgf+h/bYdRDuvwfr1JF78C2N2SGA+mE5uNsAmdQ6nP WcplpJmaTe6eKDFILtB3YPheLfLdtCyfJAGIVbjQ9iqEnCrZP/LaGtBEry06Ik+CFc0p svboUkRnljUhinXkV/M4l5Vd1VHmXV7v/Rkf3Ngcl95dwyneoFSF/o5EyWwOeMjvUcs4 i+ETPp57kRy8+BB1AuvUYhZFnp2wIGqP7DQ8OUnt863anH//kXorzqwfs3Mh/Uxa3faK ROxz9uHcLbZVpK7bMkC+SwVXjv6e3WxSReMxqifEDdnWi/jVlfj5B0Uapjdi6t/mTb47 ++jw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=UPuVQGTd29Itg1cLdxosFs0hQshc7blon1VURv3FfS4=; fh=NCGDcAlPSi/Ikjhihnh5LX8tShzN2DMDQgUACb5yy/Q=; b=Q1OnMS3f4xO8gsXoMqronno2ZDRPp/o8yIWfrGZDudzwGGfevAPkR6IuV/K67qrJgz BalNEU3BmK09IbyMajWdBpXHUaYr0HLLTnif0ytd4T3UU2zIFdBGEDb31oiwiYu7i2wm rxcE8gdnw6RE592wd2oAa+xTw7gBhCgPwRyvkofDQiov6GvpKNQ0I6hlxVVn1ej4v8Sp kZ1GAirzVMt51rXqFfcF7sc233nWOVwPotwCwr+V7vFlc2w4TmTJ0avAFMWeI2mMB8qP pjXmSO6Dc41jaLVDyesEduoKyAY8rh+zPFiOLKrR3aTka5s9mJij59K7tTGoiVUZVd6U jAgw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=daxFFWfx; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-38862-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-38862-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id k126-20020a633d84000000b005d7279d01d9si360649pga.782.2024.01.25.08.06.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 08:06:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-38862-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=daxFFWfx; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-38862-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-38862-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 3CA19B23661 for ; Thu, 25 Jan 2024 16:05:46 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D16A676901; Thu, 25 Jan 2024 16:05:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="daxFFWfx" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 24237633EC; Thu, 25 Jan 2024 16:05:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706198718; cv=none; b=VhbafeaabGCYZiGxmT3k0+iAcdVFeXqAoC/kTSIUXUYoRbHxpLWH2XFfV6QgynJHPKJhG2blDyWrMfh/mbJqB8u1ot/z0zXG1Sh3YvygB74Z7/ISLENohqHlHVpTZjpZ291Owqkdyc9ZT2VBx6rHqZEMnmAaXhC2dM04BxxGfD0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706198718; c=relaxed/simple; bh=MRGnGuzapGA9vOYUFqgizcht9g+TsWG6i/tZwigQoRo=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Type; b=kumd1GLTvKwmaXu6bHfSUBZhflPoOg5cgtc7twzqIS79e8eLjXS1A/8Ybx312LVOCmtK7d+X5S207NEP9hhCJFu8qp4TUP7hBOmfiGHcCf7GtW3I+Og4VlxxpdxdW7p0M5ifHdwYksQKXxN3JLi+rA/nlpjFwzJcxr8WipKcDkA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=daxFFWfx; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 13300C433C7; Thu, 25 Jan 2024 16:05:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706198717; bh=MRGnGuzapGA9vOYUFqgizcht9g+TsWG6i/tZwigQoRo=; h=From:To:Cc:Subject:Date:From; b=daxFFWfxY3N+31W9LgvsSPqPEJR00tIQ7fITVaroZHA3ZyockvUtYZlYlrIsWT4u1 /6oZpwZca/ESzfp+JCfXrI5q3UMAG3uxEYWLrSI6JcF9RMDdgHLZnFvdf/FsFQDfV5 Vy5DUyABhV2Amr/bnWMga6fEEphx20qEBmovpLO0AItdn7z4C+U7d/SoEHcuvIKyet 9rla4kHlu+hxkzASzZ9evH/agJGxkxeXRUFUgCYFIF4h9KGLnj5R8GGqGT/9UhrXTd N7kvBzGIPCo/AuB5Fh4l/qVFmOtXca+XgPu0Z4vT7aLJilRuqmHlFz5WCZlk6cvLJY EwOyKkJDN6rbw== From: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Mykola Lysenko , bpf@vger.kernel.org, netdev@vger.kernel.org Cc: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= , linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH bpf-next v2] selftests/bpf: Include runner extras for install target Date: Thu, 25 Jan 2024 17:05:02 +0100 Message-Id: <20240125160502.1512422-1-bjorn@kernel.org> X-Mailer: git-send-email 2.40.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789067501568565803 X-GMAIL-MSGID: 1789079114169286395 From: Björn Töpel When using the "install" or targets depending on install, e.g. "gen_tar", the "runner extras" weren't included for the BPF machine flavors. Make sure the necessary helper scripts/tools are added to corresponding BPF machine flavor. Signed-off-by: Björn Töpel --- v2: Added btf_dump_test_case files --- tools/testing/selftests/bpf/Makefile | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) base-commit: c8632acf193beac64bbdaebef013368c480bf74f diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index fd15017ed3b1..d5cff32997b3 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -744,8 +744,20 @@ EXTRA_CLEAN := $(TEST_CUSTOM_PROGS) $(SCRATCH_DIR) $(HOST_SCRATCH_DIR) \ DEFAULT_INSTALL_RULE := $(INSTALL_RULE) override define INSTALL_RULE $(DEFAULT_INSTALL_RULE) - @for DIR in $(TEST_INST_SUBDIRS); do \ - mkdir -p $(INSTALL_PATH)/$$DIR; \ - rsync -a $(OUTPUT)/$$DIR/*.bpf.o $(INSTALL_PATH)/$$DIR;\ + @for DIR in $(TEST_INST_SUBDIRS); do \ + mkdir -p $(INSTALL_PATH)/$$DIR; \ + rsync -a --copy-unsafe-links \ + $(OUTPUT)/$$DIR/bpf_testmod.ko \ + $(OUTPUT)/$$DIR/bpftool \ + $(OUTPUT)/$$DIR/ima_setup.sh \ + $(OUTPUT)/$$DIR/liburandom_read.so \ + $(OUTPUT)/$$DIR/sign-file \ + $(OUTPUT)/$$DIR/uprobe_multi \ + $(OUTPUT)/$$DIR/urandom_read \ + $(OUTPUT)/$$DIR/verify_sig_setup.sh \ + $(OUTPUT)/$$DIR/xdp_synproxy \ + $(OUTPUT)/$$DIR/btf_dump_test_case_*.c \ + $(OUTPUT)/$$DIR/*.bpf.o \ + $(INSTALL_PATH)/$$DIR; \ done endef