From patchwork Fri Jan 27 13:57:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Desnoyers X-Patchwork-Id: 49434 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp848911wrn; Fri, 27 Jan 2023 06:03:26 -0800 (PST) X-Google-Smtp-Source: AMrXdXv/ljVNmi8yWBbe+38AGGhkavx08rGXGDrbWQ2f56m7QzmdbXzy3rHK9dekjZmVNfOLqADi X-Received: by 2002:a17:902:8498:b0:194:4724:806d with SMTP id c24-20020a170902849800b001944724806dmr36740142plo.33.1674828206324; Fri, 27 Jan 2023 06:03:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674828206; cv=none; d=google.com; s=arc-20160816; b=r/Oe+X2KRVHWq2MqsCSYj48jftfkeb3p5rQCc1NKE1JoaeeonUogzBGit1tnwz3YEg E7LQ4QqngldRqu1Fa07HJZCHorb93LU3AriYQ0sVOI9VudTch9mftn3Y/y6xsJBHaZni BwEVdh6KykuCWvOUg/ycVAWquBiHqkIfD5WPwLHnG66Yps/vPE24DU05Sk4ZXKb3UMnV dizyqSCY0WV7C1c/qAX0VSTmjNsHhI9yEMPt3+zx1Z5UzPwqXPGRZjyIwforC0vCnfYY 1eNkdJI1jAlOo3K6caCKyfb1KGxbFOicLXPN4MUeT3NENvUfNwwiMPhKso0BV49b7WoU TtJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=6CleP35fxoEiU0ajTeGKWafhIRZKf9qtqIf1q/vai4o=; b=rPs4TwlvTTmnI38dbjYOjsvTPvTU5q5fF8QDtB+2KNHhMSmaPZ80nV+HgxLmqUDHYU xnkvHX3DR3kQRK70zQNz9NXbDZY0zko3HCZkx7kl5YbG0UoTyPVBn5iWUhw6awSaYy1O Hd+G00vt33Fi5AFp0rJewKaUqlvCZJ2DslzkPiEPB98suVDzFOwFegqfrdMigf52FcwR qckLe7uzKC9dzBSxaOdqwgVNukMQ8ZgmncB4ENXfyTYazIHHtw9oGd0uYTM4NSwX+WjH I+Dl8au2zr/5EN4i0uaeXhXYz+qkWuyxL87KU3v5L7Hl4Yp17BUhsOEKTllm5AOE+2Fw NbLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@efficios.com header.s=smtpout1 header.b=hZDmL7dy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=efficios.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p5-20020a1709028a8500b00196390097d0si4315823plo.502.2023.01.27.06.03.03; Fri, 27 Jan 2023 06:03:26 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@efficios.com header.s=smtpout1 header.b=hZDmL7dy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=efficios.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234564AbjA0N7F (ORCPT + 99 others); Fri, 27 Jan 2023 08:59:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37642 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233715AbjA0N6L (ORCPT ); Fri, 27 Jan 2023 08:58:11 -0500 Received: from smtpout.efficios.com (unknown [IPv6:2607:5300:203:b2ee::31e5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 68A3622012; Fri, 27 Jan 2023 05:58:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=efficios.com; s=smtpout1; t=1674827884; bh=cTnlMtt/TSsCRchCKp67NRzjFc2OauBkH++SjQF+yLg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hZDmL7dy7O2Ch69odJb+uxDN1ztpocAPZgbInxLegCpGkBT2uIve++5ALcSwFTrt6 H6VC1ypiyuQcIoiJCMtTBjzjLDU3MkYjKtmE44KbilAT2V0+KGaeGfVJ5h2XWAj0SO VNAxmOekgJ6exPS50DZMkInYwLF9ueZg4n4klwuHOEJI/5zu8trLaLIbYpkSmho7ll fOAK4W8jDIyBdrBZcSzVc/yGGZjvQx+l03PY3IAtWd6kOVeSvxxDAMOf/WMGBjIlua rO/atyofT5xpL0b02JWBfoeAMhhoJmo4f7tI9eedYMbz7ORHsfTRDxUG5gUyq60+dk fkoavG7xVcpig== Received: from localhost.localdomain (192-222-180-24.qc.cable.ebox.net [192.222.180.24]) by smtpout.efficios.com (Postfix) with ESMTPSA id 4P3K0X5QMGzhxV; Fri, 27 Jan 2023 08:58:04 -0500 (EST) From: Mathieu Desnoyers To: Shuah Khan , linux-kselftest@vger.kernel.org, Ingo Molnar Cc: linux-kernel@vger.kernel.org, Mathieu Desnoyers , stable@vger.kernel.org Subject: [PATCH 17/34] selftests: net: Fix incorrect kernel headers search path Date: Fri, 27 Jan 2023 08:57:38 -0500 Message-Id: <20230127135755.79929-18-mathieu.desnoyers@efficios.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230127135755.79929-1-mathieu.desnoyers@efficios.com> References: <20230127135755.79929-1-mathieu.desnoyers@efficios.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RDNS_NONE,SPF_HELO_NONE, SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756184661549613324?= X-GMAIL-MSGID: =?utf-8?q?1756184661549613324?= Use $(KHDR_INCLUDES) as lookup path for kernel headers. This prevents building against kernel headers from the build environment in scenarios where kernel headers are installed into a specific output directory (O=...). Signed-off-by: Mathieu Desnoyers Cc: Shuah Khan Cc: linux-kselftest@vger.kernel.org Cc: Ingo Molnar Cc: [5.18+] Acked-by: Shuah Khan --- tools/testing/selftests/net/Makefile | 2 +- tools/testing/selftests/net/bpf/Makefile | 2 +- tools/testing/selftests/net/mptcp/Makefile | 2 +- tools/testing/selftests/net/openvswitch/Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/net/Makefile b/tools/testing/selftests/net/Makefile index 3007e98a6d64..bab1222c7d50 100644 --- a/tools/testing/selftests/net/Makefile +++ b/tools/testing/selftests/net/Makefile @@ -2,7 +2,7 @@ # Makefile for net selftests CFLAGS = -Wall -Wl,--no-as-needed -O2 -g -CFLAGS += -I../../../../usr/include/ $(KHDR_INCLUDES) +CFLAGS += $(KHDR_INCLUDES) TEST_PROGS := run_netsocktests run_afpackettests test_bpf.sh netdevice.sh \ rtnetlink.sh xfrm_policy.sh test_blackhole_dev.sh diff --git a/tools/testing/selftests/net/bpf/Makefile b/tools/testing/selftests/net/bpf/Makefile index 4abaf16d2077..207b6b958f66 100644 --- a/tools/testing/selftests/net/bpf/Makefile +++ b/tools/testing/selftests/net/bpf/Makefile @@ -7,7 +7,7 @@ BPFDIR := $(abspath ../../../lib/bpf) APIDIR := $(abspath ../../../include/uapi) CCINCLUDE += -I../../bpf -CCINCLUDE += -I../../../../../usr/include/ +CCINCLUDE += $(KHDR_INCLUDES) CCINCLUDE += -I$(SCRATCH_DIR)/include BPFOBJ := $(BUILD_DIR)/libbpf/libbpf.a diff --git a/tools/testing/selftests/net/mptcp/Makefile b/tools/testing/selftests/net/mptcp/Makefile index 43a723626126..06bba013bcef 100644 --- a/tools/testing/selftests/net/mptcp/Makefile +++ b/tools/testing/selftests/net/mptcp/Makefile @@ -2,7 +2,7 @@ top_srcdir = ../../../../.. -CFLAGS = -Wall -Wl,--no-as-needed -O2 -g -I$(top_srcdir)/usr/include $(KHDR_INCLUDES) +CFLAGS = -Wall -Wl,--no-as-needed -O2 -g $(KHDR_INCLUDES) TEST_PROGS := mptcp_connect.sh pm_netlink.sh mptcp_join.sh diag.sh \ simult_flows.sh mptcp_sockopt.sh userspace_pm.sh diff --git a/tools/testing/selftests/net/openvswitch/Makefile b/tools/testing/selftests/net/openvswitch/Makefile index 2f1508abc826..41ddfa9fdd1d 100644 --- a/tools/testing/selftests/net/openvswitch/Makefile +++ b/tools/testing/selftests/net/openvswitch/Makefile @@ -2,7 +2,7 @@ top_srcdir = ../../../../.. -CFLAGS = -Wall -Wl,--no-as-needed -O2 -g -I$(top_srcdir)/usr/include $(KHDR_INCLUDES) +CFLAGS = -Wall -Wl,--no-as-needed -O2 -g $(KHDR_INCLUDES) TEST_PROGS := openvswitch.sh