From patchwork Wed Mar 4 22:13:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shuah Khan X-Patchwork-Id: 208723 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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 7ABA7C3F2D8 for ; Wed, 4 Mar 2020 22:14:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5103F20848 for ; Wed, 4 Mar 2020 22:14:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583360071; bh=9xkWWaunI0gSEGO5Cx/X+dLsjBfzYO7QN/sVfu/HjV4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=x/0BuJEgFfvbZTnJzLxmswvVURxBSCigc0BXB4X5hLDss5wN8fZFPVHZPup/wcXz9 nf43zYG3efX+Hy0eeatAqrzIB5Jdz4Udy0nwYY1d9G4w4S6tKSq4ONQnSQKr12beqR SMjrSigvlF7x/BSx+HVIubhXsU7fw/FVLkL9H4qQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388490AbgCDWOV (ORCPT ); Wed, 4 Mar 2020 17:14:21 -0500 Received: from mail-io1-f68.google.com ([209.85.166.68]:39583 "EHLO mail-io1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388484AbgCDWOV (ORCPT ); Wed, 4 Mar 2020 17:14:21 -0500 Received: by mail-io1-f68.google.com with SMTP id h3so4210325ioj.6 for ; Wed, 04 Mar 2020 14:14:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0yZwBZUwL8PIwAcU8o7bWc8CP5XNPRFSTvCyJ7jQ5mQ=; b=I4UUtFHvX08Sx91UacVsT5PS2tj7qzVvr6l/ln4WrvjZxc/i8jv/oFJQOcNxDSmPBd ybh5nq8cpARJYCIJvgXwLurW1TEnq2g9Nv81GdPBn4liETzXdczFoTIvy6Zw3R1y+sam aa2bFrPARsOlrcGFyug0jM1U6XwTvVb4XBbbs= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=0yZwBZUwL8PIwAcU8o7bWc8CP5XNPRFSTvCyJ7jQ5mQ=; b=SrKn1L5pWxTMqMlAYuIbrX6PazRY3uCChvCqYgKBDHd1Eaxwe27yHj/LfvlPSJdzAJ 8JRRTxUDQBKVIpf87o4kNhYaqwJAvrQcH4JTe4cp5jIk4HDEeJ7tgSmONR9BUwrAXDCW Yx1a2ZNe24VnSRigZMIXRpVgN7Afs8A8tANuIQFsYJrUfYInU8fwElz0UvyDf9zUpclF St4I4LhG639JPqP2BGHbBexWhJ++UuvNrseonIA5g1b91NF0JZqcUvUh0KnanxNuBMep opf3QVnDThFtzG7+2eLyvKDUBT4x5Co9p906gSp3vaHvvK1DbjBcJlBgTefFbV4HB/4M sniw== X-Gm-Message-State: ANhLgQ3gJ3/pC1ldtTj1X1NHG7/JhYXRgp2O+tNRf8jtxqoPIlzthRmf JPBKuOym3qlbwjnNaENqDtbl9w== X-Google-Smtp-Source: ADFU+vu9yfqsq5F9oa+zo3RCZeuK0hGfEJ8oFClTaKU0IJAaGmFuBoMBmSAKAqtJ7WlWRbKZ5R7jew== X-Received: by 2002:a5d:9697:: with SMTP id m23mr4104634ion.45.1583360060224; Wed, 04 Mar 2020 14:14:20 -0800 (PST) Received: from shuah-t480s.internal (c-24-9-64-241.hsd1.co.comcast.net. [24.9.64.241]) by smtp.gmail.com with ESMTPSA id g12sm6850409iom.5.2020.03.04.14.14.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2020 14:14:19 -0800 (PST) From: Shuah Khan To: shuah@kernel.org, keescook@chromium.org, luto@amacapital.net, wad@chromium.org, daniel@iogearbox.net, kafai@fb.com, yhs@fb.com, andriin@fb.com, gregkh@linuxfoundation.org, tglx@linutronix.de Cc: Shuah Khan , khilman@baylibre.com, mpe@ellerman.id.au, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH 2/4] selftests: Fix seccomp to support relocatable build (O=objdir) Date: Wed, 4 Mar 2020 15:13:33 -0700 Message-Id: <11967e5f164f0cd717921bd382ff9c13ef740146.1583358715.git.skhan@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Fix seccomp relocatable builds. This is a simple fix to use the right lib.mk variable TEST_GEN_PROGS for objects to leverage lib.mk common framework for relocatable builds. Signed-off-by: Shuah Khan --- tools/testing/selftests/seccomp/Makefile | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/tools/testing/selftests/seccomp/Makefile b/tools/testing/selftests/seccomp/Makefile index 1760b3e39730..a8a9717fc1be 100644 --- a/tools/testing/selftests/seccomp/Makefile +++ b/tools/testing/selftests/seccomp/Makefile @@ -1,17 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 -all: - -include ../lib.mk - -.PHONY: all clean - -BINARIES := seccomp_bpf seccomp_benchmark CFLAGS += -Wl,-no-as-needed -Wall +LDFLAGS += -lpthread -seccomp_bpf: seccomp_bpf.c ../kselftest_harness.h - $(CC) $(CFLAGS) $(LDFLAGS) $< -lpthread -o $@ - -TEST_PROGS += $(BINARIES) -EXTRA_CLEAN := $(BINARIES) +TEST_GEN_PROGS := seccomp_bpf seccomp_benchmark -all: $(BINARIES) +include ../lib.mk From patchwork Wed Mar 4 22:13:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shuah Khan X-Patchwork-Id: 208724 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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham 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 D244DC3F2CE for ; Wed, 4 Mar 2020 22:14:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A36E720870 for ; Wed, 4 Mar 2020 22:14:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583360067; bh=8YtaRovbocska2CoTH6bYQgSQtXxX7l0Lg3wK/KeTpM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=SCBZpN2N8KoHAZo58gT94mbNAywlxAgcCOI8e1imvgb3jQZ7fTk36hqZlT0iTG34v DRB5FaydL3YgyhZbuQwbTurWeqje4/eMPxQogU/WWAvR2d1LYBVDvfFnl3+v7QrDNW KObCbNMi7P5zUgkL9ig1LqPLYF5NTJMciSCsxuhY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388528AbgCDWO0 (ORCPT ); Wed, 4 Mar 2020 17:14:26 -0500 Received: from mail-il1-f171.google.com ([209.85.166.171]:38449 "EHLO mail-il1-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388508AbgCDWOZ (ORCPT ); Wed, 4 Mar 2020 17:14:25 -0500 Received: by mail-il1-f171.google.com with SMTP id f5so3250222ilq.5 for ; Wed, 04 Mar 2020 14:14:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BNOtEzNwp4ie5FRfbU1U4EX7nRGPjUgtolRpVq/MBE4=; b=OjekLCqZXQTwkl6Q5+uW5RbrmRq1XHvjg72IzgF+tE8FYdmbprWuZXrMRaz2opWp96 eogbo2K2F7+AuIYJXXRlnEbypRyif+rw8vKoVtGZtYDP7P/6XPjLzZGOvctKs/o8fNmS sPQwOLyx918g6f4J/GeVMND2UO72j7YBTftAI= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=BNOtEzNwp4ie5FRfbU1U4EX7nRGPjUgtolRpVq/MBE4=; b=q9tI9FCf7SyFV+cITaaiDNRzFGIhDq4fWHRJDIJDP9iq6UzvbTt9UTD0ax6RUsqhf5 5qC5dvnW2d2TeHdc3MHq1CBTtMTsxszsEUD6PG2J82P13Gyne3A/fAMp/FNR343fOHHR Zz6V5pQehlqecNZl7Hy2ewl2Npy07Rj4DnyeOjngXsbYDyJjToLuGgoVkhE8/ch06NDJ Bku+hbFGp+f0EWLOzej9hAJ+gYIBwKvboqgIkDXC/KMabh6RhtEVeK/DDQSnhWXcCv0j +rVBh+0gIFJ+9DbgdiUaQci3YcmvB0da2ROWYOCAlfEC79hfqegi3p6Tow2UikmgITey yJ2w== X-Gm-Message-State: ANhLgQ0iuplbEEJJfcIVw5kmEW8uYGYwQh2BfFVwXY7N3KhT7pSNqDWA tAM4EpVk/Z9pX9pQUINfAKrMuw== X-Google-Smtp-Source: ADFU+vsMyK+BNv06am40GT7NHnRVpySeoKNzTfsH6ZdL+TH4iiTcuGpNh3lpNJhPS8RjcOqAd+KcwQ== X-Received: by 2002:a92:5b11:: with SMTP id p17mr4890257ilb.202.1583360064649; Wed, 04 Mar 2020 14:14:24 -0800 (PST) Received: from shuah-t480s.internal (c-24-9-64-241.hsd1.co.comcast.net. [24.9.64.241]) by smtp.gmail.com with ESMTPSA id g12sm6850409iom.5.2020.03.04.14.14.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2020 14:14:24 -0800 (PST) From: Shuah Khan To: shuah@kernel.org, gregkh@linuxfoundation.org, tglx@linutronix.de Cc: Shuah Khan , khilman@baylibre.com, mpe@ellerman.id.au, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/4] selftests: android: Fix custom install from skipping test progs Date: Wed, 4 Mar 2020 15:13:35 -0700 Message-Id: <738dd72fe6c4c277a39f1cab10b342c477e0464f.1583358715.git.skhan@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Update custom install rule to install all generated test programs. This fixes android/ion tests to be installed correctly. Signed-off-by: Shuah Khan --- tools/testing/selftests/android/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/android/Makefile b/tools/testing/selftests/android/Makefile index 7c462714b418..9258306cafe9 100644 --- a/tools/testing/selftests/android/Makefile +++ b/tools/testing/selftests/android/Makefile @@ -21,7 +21,7 @@ all: override define INSTALL_RULE mkdir -p $(INSTALL_PATH) - install -t $(INSTALL_PATH) $(TEST_PROGS) $(TEST_PROGS_EXTENDED) $(TEST_FILES) +install -t $(INSTALL_PATH) $(TEST_PROGS) $(TEST_PROGS_EXTENDED) $(TEST_FILES) $(TEST_GEN_PROGS) $(TEST_CUSTOM_PROGS) $(TEST_GEN_PROGS_EXTENDED) $(TEST_GEN_FILES) @for SUBDIR in $(SUBDIRS); do \ BUILD_TARGET=$(OUTPUT)/$$SUBDIR; \