From patchwork Fri Apr 5 20:51:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 1078738 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44bX6T5P9vz9sRL; Sat, 6 Apr 2019 07:51:29 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1hCVnz-0004It-W8; Fri, 05 Apr 2019 20:51:19 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1hCVny-0004IZ-RE for kernel-team@lists.ubuntu.com; Fri, 05 Apr 2019 20:51:18 +0000 Received: from mail-yb1-f198.google.com ([209.85.219.198]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1hCVny-00049b-Bn for kernel-team@lists.ubuntu.com; Fri, 05 Apr 2019 20:51:18 +0000 Received: by mail-yb1-f198.google.com with SMTP id k188so5386524yba.2 for ; Fri, 05 Apr 2019 13:51:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YNwZbQc3jFkjd3RD/IzMV0O67OqM/Is4DudZObJu9Sg=; b=Zmfiggwl2a6gbXIv1gXPaBz+bwQWrqfC8NE9LeoqunTlfHeBnV+Q/6NPqypj0gSmsA KL6daXThVTJpjXQ6JTnMRPYJWzGLv58SkAqbe7Udz8fAio5ua6q5UAIlmThjd10NhOWo q6yDkfLaMelUtK0upnSRgsqqpYOdrNjvQlrpeTTZxv5OiJQqQjTcDsYcNvSGXGulEgSb +gm9xuS0nmNnparImgODnHDLw4LYg4Czsxytlj0wQfXdPy/RqOPlee6b8seTIRFjQzmX qssfVav116jAt6kGidlWsSYrKHsSgo+9Z0EWNoGwL8UpwE+8bCCXPa1hBijelwJeo72s d5HA== X-Gm-Message-State: APjAAAVkWSn3m9+0tBBZacG/0igYmYEHLri6tFwQ2bpXH9RbVsT8WHAT 6WWeaOdhc7pJHiTKiu5mI+Gp4jTwcOyezqBChlCGp4CvtUhpoXLsdi0XTjJZYRTheNG8HCmt260 PK400OkUzf/quMRJRxCoKIge8+sN1K0U7v/3dhmz0Rw== X-Received: by 2002:a5b:749:: with SMTP id s9mr12859970ybq.447.1554497477234; Fri, 05 Apr 2019 13:51:17 -0700 (PDT) X-Google-Smtp-Source: APXvYqyta2O8TZaLQgRaIu77ZdUj5mpUTDf60upVA10mqb2irJFS/4+Kdw/qdizsOuoEPS/vGIYH+Q== X-Received: by 2002:a5b:749:: with SMTP id s9mr12859945ybq.447.1554497476841; Fri, 05 Apr 2019 13:51:16 -0700 (PDT) Received: from localhost ([2605:a601:ac2:fb20:3d51:1338:4e8e:1eab]) by smtp.gmail.com with ESMTPSA id p2sm9638529ywp.53.2019.04.05.13.51.15 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 05 Apr 2019 13:51:16 -0700 (PDT) From: Seth Forshee To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/2][linux-aws/disco] UBUNTU: SAUCE: selftests: net: don't fail test_bpf when module is not present Date: Fri, 5 Apr 2019 15:51:12 -0500 Message-Id: <20190405205113.22762-2-seth.forshee@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190405205113.22762-1-seth.forshee@canonical.com> References: <20190405205113.22762-1-seth.forshee@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1823407 Signed-off-by: Seth Forshee --- tools/testing/selftests/net/test_bpf.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/test_bpf.sh b/tools/testing/selftests/net/test_bpf.sh index 65677909c574..fa1ec4aa0ada 100755 --- a/tools/testing/selftests/net/test_bpf.sh +++ b/tools/testing/selftests/net/test_bpf.sh @@ -2,7 +2,10 @@ # SPDX-License-Identifier: GPL-2.0 # Runs bpf test using test_bpf kernel module -if /sbin/modprobe -q test_bpf ; then +# Test whether test_bpf module exists +if ! /sbin/modprobe -q -n test_bpf; then + echo "SKIP: test_bpf module not found" +elif /sbin/modprobe -q test_bpf ; then /sbin/modprobe -q -r test_bpf; echo "test_bpf: ok"; else