From patchwork Tue Nov 19 10:50:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Monnet X-Patchwork-Id: 1197356 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=netronome.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="iNW9Eky+"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47HMzd6nhcz9sR8 for ; Tue, 19 Nov 2019 21:50:21 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727560AbfKSKuT (ORCPT ); Tue, 19 Nov 2019 05:50:19 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:38849 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726980AbfKSKuT (ORCPT ); Tue, 19 Nov 2019 05:50:19 -0500 Received: by mail-wr1-f66.google.com with SMTP id i12so23236967wro.5 for ; Tue, 19 Nov 2019 02:50:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=VtahxqjVeuCdwoGzoPXc72omB/a3UxEWdQncKPHu5AQ=; b=iNW9Eky+z+ELXzIaMIpYMLxGObSuDpDFwwQrl0nWnobC71IOob/eltUGs1CUL/8iSa MPLCLKHtlof/6a+b0hCeLcaiqS3yez7DoTzCf5iv1DsHjb07PKw5goZvDfNvUUo+oGe+ B5kmyJLqds0NCPoredHuTRWYq5h9FPE2GkFu2EWW7bvZMi3uCgKcLbrHmqTqiLEcCB4v Y5wtWuL3jMsy5YTpPGJR3tPX2+uuAKFqSNXX6cuIbXbMbhC1nyoeK02HJ7ybJPPhyLAc qrB0jk3gJM0m8JIEu2+Yu9Hfhi4nGNp3aBfqFS3G6XAU6tDMNQt6ts4DPQ0YDwZb+IwI ftKQ== 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; bh=VtahxqjVeuCdwoGzoPXc72omB/a3UxEWdQncKPHu5AQ=; b=ZjlW3j6EsMf6fFuxRDvac3ODTcIbOpOmuUj6pQvd++DMhXJbUuF2XH7EKI3KzoYwow ed15URsP1KbmdGK5B07HO87ulNMmYixBmEl419pnPKG2M0uyLCiNMukgdANWOTlPPC6C euv5dDz4UfZWl0KwroI6oCJa216IR26xFnRVtCI8kXu0YF/RwJatvsXyvXq9UYXoJNI/ lFPmk/ctubjaDaiGPxqs9GPmb7SRn99Ju9casQW+6BeS12wMUhhOFnKNfwT0FqFX2AfO nufuwDEnOFerG2CdTVUMQeSFAlNlsl6xCcvCDhcAyAHainyXMKHOoifoNZtOo6sQu5dM zdLQ== X-Gm-Message-State: APjAAAX7jGeZ5c0i9sAJTyucqqJS3pD3pUIst2Dn31EayaeoqtSbsWky 2vr4Ki+DgGBpQxLlH2GtGzvNCw== X-Google-Smtp-Source: APXvYqwsVb6LQAwZDbYFsQCXjKUiwldoMdtj1QrCtMI4ERl1Mqjmg/tSwHuMDU3NVeJ/IKBZueWglQ== X-Received: by 2002:adf:e2cd:: with SMTP id d13mr23459204wrj.221.1574160617301; Tue, 19 Nov 2019 02:50:17 -0800 (PST) Received: from cbtest32.netronome.com ([217.38.71.146]) by smtp.gmail.com with ESMTPSA id g5sm2646708wma.43.2019.11.19.02.50.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Nov 2019 02:50:16 -0800 (PST) From: Quentin Monnet To: Alexei Starovoitov , Daniel Borkmann Cc: bpf@vger.kernel.org, netdev@vger.kernel.org, oss-drivers@netronome.com, Quentin Monnet , Naresh Kamboju , Jakub Kicinski Subject: [PATCH bpf-next 1/2] selftests: bpftool: set EXIT trap after usage function Date: Tue, 19 Nov 2019 10:50:09 +0000 Message-Id: <20191119105010.19189-2-quentin.monnet@netronome.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191119105010.19189-1-quentin.monnet@netronome.com> References: <20191119105010.19189-1-quentin.monnet@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The trap on EXIT is used to clean up any temporary directory left by the build attempts. It is not needed when the user simply calls the script with its --help option, and may not be needed either if we add checks (e.g. on the availability of bpftool files) before the build attempts. Let's move this trap and related variables lower down in the code, so that we don't accidentally change the value returned from the script on early exits at pre-checks. Signed-off-by: Quentin Monnet Reviewed-by: Jakub Kicinski --- .../selftests/bpf/test_bpftool_build.sh | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/tools/testing/selftests/bpf/test_bpftool_build.sh b/tools/testing/selftests/bpf/test_bpftool_build.sh index 4ba5a34bff56..1fc6f6247f9b 100755 --- a/tools/testing/selftests/bpf/test_bpftool_build.sh +++ b/tools/testing/selftests/bpf/test_bpftool_build.sh @@ -1,18 +1,6 @@ #!/bin/bash # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) -ERROR=0 -TMPDIR= - -# If one build fails, continue but return non-0 on exit. -return_value() { - if [ -d "$TMPDIR" ] ; then - rm -rf -- $TMPDIR - fi - exit $ERROR -} -trap return_value EXIT - case $1 in -h|--help) echo -e "$0 [-j ]" @@ -20,7 +8,7 @@ case $1 in echo -e "" echo -e "\tOptions:" echo -e "\t\t-j :\tPass -j flag to 'make'." - exit + exit 0 ;; esac @@ -33,6 +21,18 @@ SCRIPT_REL_DIR=$(dirname $SCRIPT_REL_PATH) KDIR_ROOT_DIR=$(realpath $PWD/$SCRIPT_REL_DIR/../../../../) cd $KDIR_ROOT_DIR +ERROR=0 +TMPDIR= + +# If one build fails, continue but return non-0 on exit. +return_value() { + if [ -d "$TMPDIR" ] ; then + rm -rf -- $TMPDIR + fi + exit $ERROR +} +trap return_value EXIT + check() { local dir=$(realpath $1) From patchwork Tue Nov 19 10:50:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Monnet X-Patchwork-Id: 1197355 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: incoming-bpf@patchwork.ozlabs.org Delivered-To: patchwork-incoming-bpf@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=bpf-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=netronome.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="Te9dzMeK"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47HMzd6PQJz9sR6 for ; Tue, 19 Nov 2019 21:50:21 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726980AbfKSKuU (ORCPT ); Tue, 19 Nov 2019 05:50:20 -0500 Received: from mail-wr1-f53.google.com ([209.85.221.53]:40447 "EHLO mail-wr1-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727533AbfKSKuU (ORCPT ); Tue, 19 Nov 2019 05:50:20 -0500 Received: by mail-wr1-f53.google.com with SMTP id q15so10424791wrw.7 for ; Tue, 19 Nov 2019 02:50:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=lW5fYRFznQhl0mYpmoGVfe9AF6AxfqUaLZDYUmnCmhA=; b=Te9dzMeKQ/g3QeWAL/NqxnIQgAz29j+NrZKaOGHypjJ6636AzHOnyU2xEZkC4JHBXr FGf5xvOwpYHR1LAleyeDhgFQ6wWjjgKklFqWEnWywKhZRt+iecUWFo5XAWLH2hMJFsaw QK9dOmV0ei17UBJQs/adzFSrQE59csR57w8K1la5StOLcXgrNzrQmaeem6GCkjnG/u5H Bsez+qxvKtdj/H+5koyftTLCeIg9Coahdpl+adLe8ot69Vv5yHsazxl2+za9Uq9C6hjv aSx5YzMMcLVOnzG0xCUDXkebaY9CqGZZmLtsD+Uo/aZD5BdogVAhsSOJCd3577xSsEAJ +Q/Q== 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; bh=lW5fYRFznQhl0mYpmoGVfe9AF6AxfqUaLZDYUmnCmhA=; b=WIgSH75TNCbomA1eRSPEcXkh8Dvc7kNUDtWMIAfxw1+Qk0Z9rhAaslv3pI2p08V6NC GyHM4KcBQ3jPt2CH4PTG3FaTs9dEps1p4GWZAzqfp0eHtYDtnxjSOOUQJ9jNs/UsV3TX AOOcB0bUGmeMsWAt2AUhg8tOi3Y3e0QTB/Un3Z4zmrHHk+6En2v7JIhMlcR7gZ1WNhOC qZw5eu8u/aINaq7/ahA84SBoTOae0joLjPctwwBWHa19dfNCK7uUReehKNakQlpqvNNR ayB7v+MSIBhwefW1dZ1+4vhO7UGt2w5rrOIwckvjMPaiogVMq+S9uoahH4mYTK1s4fXi J+bw== X-Gm-Message-State: APjAAAVOVnO0b6iBt1PtRLleYJ49X6fr53S7UWw5w4PAh2bsSSZWhIiX n00MttbJDnr15Z0LeIgHh4BT9A== X-Google-Smtp-Source: APXvYqwhTfqu1QWzjU7vd7becuO8YTxtRPabMruCbJ0rnyKXdwXwQaqTMdErMxLuRr/bfdkXuMjEyA== X-Received: by 2002:a5d:66cf:: with SMTP id k15mr35217258wrw.38.1574160618494; Tue, 19 Nov 2019 02:50:18 -0800 (PST) Received: from cbtest32.netronome.com ([217.38.71.146]) by smtp.gmail.com with ESMTPSA id g5sm2646708wma.43.2019.11.19.02.50.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Nov 2019 02:50:17 -0800 (PST) From: Quentin Monnet To: Alexei Starovoitov , Daniel Borkmann Cc: bpf@vger.kernel.org, netdev@vger.kernel.org, oss-drivers@netronome.com, Quentin Monnet , Naresh Kamboju , Jakub Kicinski Subject: [PATCH bpf-next 2/2] selftests: bpftool: skip the build test if not in tree Date: Tue, 19 Nov 2019 10:50:10 +0000 Message-Id: <20191119105010.19189-3-quentin.monnet@netronome.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191119105010.19189-1-quentin.monnet@netronome.com> References: <20191119105010.19189-1-quentin.monnet@netronome.com> Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org From: Jakub Kicinski If selftests are copied over to another machine/location for execution the build test of bpftool will obviously not work, since the sources are not copied. Skip it if we can't find bpftool's Makefile. Reported-by: Naresh Kamboju Signed-off-by: Jakub Kicinski Signed-off-by: Quentin Monnet --- tools/testing/selftests/bpf/test_bpftool_build.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/testing/selftests/bpf/test_bpftool_build.sh b/tools/testing/selftests/bpf/test_bpftool_build.sh index 1fc6f6247f9b..ac349a5cea7e 100755 --- a/tools/testing/selftests/bpf/test_bpftool_build.sh +++ b/tools/testing/selftests/bpf/test_bpftool_build.sh @@ -20,6 +20,10 @@ SCRIPT_REL_PATH=$(realpath --relative-to=$PWD $0) SCRIPT_REL_DIR=$(dirname $SCRIPT_REL_PATH) KDIR_ROOT_DIR=$(realpath $PWD/$SCRIPT_REL_DIR/../../../../) cd $KDIR_ROOT_DIR +if [ ! -e tools/bpf/bpftool/Makefile ]; then + echo -e "skip: bpftool files not found!\n" + exit 0 +fi ERROR=0 TMPDIR=