From patchwork Sun Mar 19 07:42:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zi Shen Lim X-Patchwork-Id: 95450 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp457872qgd; Sun, 19 Mar 2017 00:42:36 -0700 (PDT) X-Received: by 10.99.245.21 with SMTP id w21mr24413464pgh.33.1489909356387; Sun, 19 Mar 2017 00:42:36 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 3si13677817plx.9.2017.03.19.00.42.36; Sun, 19 Mar 2017 00:42:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751332AbdCSHmd (ORCPT + 6 others); Sun, 19 Mar 2017 03:42:33 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:33333 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751180AbdCSHmc (ORCPT ); Sun, 19 Mar 2017 03:42:32 -0400 Received: by mail-pf0-f196.google.com with SMTP id p189so7813985pfp.0 for ; Sun, 19 Mar 2017 00:42:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=HtHs9YSMqFpgWYxVOfGvqX4YjVJbE4KywrB3QZaLhys=; b=L5KXS815AyxQ4BjtpycIuYpYFciyrQqt0hfahyXFb28RajJ5cOMSryIPPG+4G8jTOC oW+c7ad4Mo4bLHXsGGYHmM35l0EIVdU1oUvlmFzQnWIoN5VVulZjDRoHLzC6fUIYqHAP 6VTMP6hDspoogrTpY4X/thUlkqTwGCNM8M2njerVdXJUVDcQMSWZYT8PFLVejI6aHI3U tF+k9J/Lf+CkXau0kX2rEYj5fADSGRtBvereOyA8b647Qi+PEb60NCPpBAGA77QyeZbF 0EhMhUIv3CbIMxB2LefEue0J0fdkujXhm8ZfE7J2usR17zwzloQy1HXGkxUKO9+hd4Kh lqVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=HtHs9YSMqFpgWYxVOfGvqX4YjVJbE4KywrB3QZaLhys=; b=YDKalEl65wR+1iev70rO3wOwhk1FVhPBwEx165Udt1noK4vC5FckDPdY8dJBI0M5Gs 4lSPI915MWM3T6FrItHmVfsdIclp70twre8mLBC0bz5iz4J7ihKfZM9cNtuUIyWv32aw eHEJ+UA56D+M9munv+RfXHd9LUb2Fv+r+fUndso6ElQhzMCmRor1oWX/zjzeWUrdhyLU aapkMcxvofQahsdwsYIOB1jxSxPzZhi2qomMCH5eNHss7bf41cLNvm5b4KcsMPW23845 X8iCdjr530vxbYI/NyaqN9is0YUmqomaKrAP3BMto8cfSo1HfISXgaPiRNKqHN1jwtGy RUWQ== X-Gm-Message-State: AFeK/H2W5xm2/xNh2tPtUVyZuF3j0d6p2UJModuRKSibIjKprT1yZY+vgM8n5fzOoA9iPA== X-Received: by 10.98.97.68 with SMTP id v65mr25859282pfb.124.1489909351638; Sun, 19 Mar 2017 00:42:31 -0700 (PDT) Received: from localhost.localdomain (c-73-223-118-172.hsd1.ca.comcast.net. [73.223.118.172]) by smtp.gmail.com with ESMTPSA id d10sm26063738pfl.59.2017.03.19.00.42.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 19 Mar 2017 00:42:30 -0700 (PDT) From: Zi Shen Lim To: "David S . Miller" Cc: Zi Shen Lim , Alexei Starovoitov , Daniel Borkmann , Shuah Khan , netdev@vger.kernel.org Subject: [PATCH net] selftests/bpf: fix broken build, take 2 Date: Sun, 19 Mar 2017 00:42:23 -0700 Message-Id: <1489909343-3734-1-git-send-email-zlim.lnx@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Merge of 'linux-kselftest-4.11-rc1': 1. Partially removed use of 'test_objs' target, breaking force rebuild of BPFOBJ, introduced in commit d498f8719a09 ("bpf: Rebuild bpf.o for any dependency update"). Update target so dependency on BPFOBJ is restored. 2. Introduced commit 2047f1d8ba28 ("selftests: Fix the .c linking rule") which fixes order of LDLIBS. Commit d02d8986a768 ("bpf: Always test unprivileged programs") added libcap dependency into CFLAGS. Use LDLIBS instead to fix linking of test_verifier. 3. Introduced commit d83c3ba0b926 ("selftests: Fix selftests build to just build, not run tests"). Reordering the Makefile allows us to remove the 'all' target. Tested on Ubuntu 16.04.2. Signed-off-by: Zi Shen Lim --- tools/testing/selftests/bpf/Makefile | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) -- 2.7.4 diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index 67531f4..a61efd9 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -1,22 +1,21 @@ LIBDIR := ../../../lib BPFOBJ := $(LIBDIR)/bpf/bpf.o -CFLAGS += -Wall -O2 -lcap -I../../../include/uapi -I$(LIBDIR) $(BPFOBJ) +CFLAGS += -Wall -O2 -I../../../include/uapi -I$(LIBDIR) +LDLIBS += -lcap TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_lpm_map TEST_PROGS := test_kmod.sh -all: $(TEST_GEN_PROGS) +include ../lib.mk + +$(TEST_GEN_PROGS): $(BPFOBJ) -.PHONY: all clean force +.PHONY: force # force a rebuild of BPFOBJ when its dependencies are updated force: $(BPFOBJ): force $(MAKE) -C $(dir $(BPFOBJ)) - -$(test_objs): $(BPFOBJ) - -include ../lib.mk