Received: by 2002:a25:683:0:0:0:0:0 with SMTP id 125csp114000ybg; Mon, 8 Jun 2020 18:00:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz39H+ITlzSVYAdNx7f0cFcJBKd7iJUBSQ1U4cVi4XIb4fiBBzZbCSN4vqvBUQSCDS2GC/K X-Received: by 2002:a50:fa8d:: with SMTP id w13mr24740585edr.324.1591664437585; Mon, 08 Jun 2020 18:00:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591664437; cv=none; d=google.com; s=arc-20160816; b=yAEmdiLQMuWvqIA7ee9hQ4YAQykP+vauVP0ibruQ/DjGPFN41HpdV0OT64pdMspGZs 6rTi8GdVvKmojFCvOP+aZTcVbBGNAI/yWpU4VH5uPUlEQSdCOezDLhxGaB7xDpkIUr/K 7svipLZ9sMQ2ndOx8/qkrAF6WIyZ+MLWHUZvmBYmPeRXdsTLZLTtvMiTLp6Jd0oZC21h ZXKFpGYKamnFTLgtxDyqnNRknT1ZY9/ToWffnVOHvKk+iBXSGqm6Bu95lZ3Ui92QeB3t Qa3RKValPLvvC5vLJb7fx49lnBFACAO9o7HTAUr+W4vUbEgMoRkcecr4fmsuYDNn5+b2 GqDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=bHwCQcmGxsALC8Zz3si9QapOLk5n6nukAq5svGjT7bg=; b=uQ9MSsIKD681vFar0g56gtRNEE+5vWHekF5QbK6lV3rUfPMwIeIX2U0hZA7NBZrL9Q giduepmAEH4a85PgReTgxARAFllfQ07K818VE6VMUAJXVASuTUp/MmLtMgH/4S25AX1B lbw5U6rigURQQA5xnBH/tCESPzEBB5syon+9kY80OwmARRJtpM9lyZ9hGsDuedu3qgGH qzmNknl6ryFDwYR2ZE2OuSB/lVXTX1ETn17l/NTvK4ZuyjspdJVcUcrb9cA73gNP5BBn Km+TGgFI74MJeyA7j0XOcTOTI8IyR2E4sEmVtXSeJpZBcFlyCZQuuqkAm/7xPE9hI3cq 62QQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=1PdaeVUa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y24si9865074eju.288.2020.06.08.18.00.14; Mon, 08 Jun 2020 18:00:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=1PdaeVUa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388039AbgFIA4j (ORCPT + 99 others); Mon, 8 Jun 2020 20:56:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:54616 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728311AbgFHXJA (ORCPT ); Mon, 8 Jun 2020 19:09:00 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6EBAB208C3; Mon, 8 Jun 2020 23:08:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591657740; bh=WKJng0jJUUQ4uEiNq23wqnHnxSWZqDkR0bpKIrh4DBU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1PdaeVUasUdu8sql2wZyOacsg/RHRkRxYLyeO8jvzcRKlkTxKcpvQBxluw+elr4FP GlKJpQgSzItDJLoN5/sOPT5gyo5EiXNu6EuLZRwKicvgc2RPPmldCOMgeiYMK/Lu49 N+eIU5Ll3gjvqELFGnyeivdrao0RwWHOvLqKGSB0= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Andrii Nakryiko , Alexei Starovoitov , Sasha Levin , linux-kselftest@vger.kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH AUTOSEL 5.7 129/274] selftests/bpf: Ensure test flavors use correct skeletons Date: Mon, 8 Jun 2020 19:03:42 -0400 Message-Id: <20200608230607.3361041-129-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200608230607.3361041-1-sashal@kernel.org> References: <20200608230607.3361041-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andrii Nakryiko [ Upstream commit 76148faa161e7cfb2d7719f35b37d7db4f3f8596 ] Ensure that test runner flavors include their own skeletons from / directory. Previously, skeletons generated for no-flavor test_progs were used. Apart from fixing correctness, this also makes it possible to compile only flavors individually: $ make clean && make test_progs-no_alu32 ... now succeeds ... Fixes: 74b5a5968fe8 ("selftests/bpf: Replace test_progs and test_maps w/ general rule") Signed-off-by: Andrii Nakryiko Signed-off-by: Alexei Starovoitov Link: https://lore.kernel.org/bpf/20200429012111.277390-2-andriin@fb.com Signed-off-by: Sasha Levin --- tools/testing/selftests/bpf/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index 4e654d41c7af..01c95f8278c7 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -324,7 +324,7 @@ $(TRUNNER_TEST_OBJS): $(TRUNNER_OUTPUT)/%.test.o: \ $(TRUNNER_BPF_SKELS) \ $$(BPFOBJ) | $(TRUNNER_OUTPUT) $$(call msg,TEST-OBJ,$(TRUNNER_BINARY),$$@) - cd $$(@D) && $$(CC) $$(CFLAGS) -c $(CURDIR)/$$< $$(LDLIBS) -o $$(@F) + cd $$(@D) && $$(CC) -I. $$(CFLAGS) -c $(CURDIR)/$$< $$(LDLIBS) -o $$(@F) $(TRUNNER_EXTRA_OBJS): $(TRUNNER_OUTPUT)/%.o: \ %.c \ -- 2.25.1