From patchwork Fri Mar 31 15:27:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russell Bryant X-Patchwork-Id: 745699 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vvlkv5NJsz9s0g for ; Sat, 1 Apr 2017 02:27:33 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 9CCCA93E; Fri, 31 Mar 2017 15:27:30 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 3A8238A1 for ; Fri, 31 Mar 2017 15:27:29 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 7B05B131 for ; Fri, 31 Mar 2017 15:27:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 839258E66A; Fri, 31 Mar 2017 15:27:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 839258E66A Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=ovn.org Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=russell@ovn.org DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 839258E66A Received: from t460s.redhat.com (ovpn-124-210.rdu2.redhat.com [10.10.124.210]) by smtp.corp.redhat.com (Postfix) with ESMTP id AB5458187A; Fri, 31 Mar 2017 15:27:26 +0000 (UTC) From: Russell Bryant To: dev@openvswitch.org Date: Fri, 31 Mar 2017 11:27:23 -0400 Message-Id: <20170331152723.5794-1-russell@ovn.org> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Fri, 31 Mar 2017 15:27:27 +0000 (UTC) X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH] build: Don't run tests in rpm makefile targets. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org The RPM build makefile targets are helpful during development and testing, but I personally almost never want the tests to run when I use them. Leave tests on by default in the spec file for when the package is built by distro build systems, but disable it by default in the Makefile targets and update the documentation accordingly. Signed-off-by: Russell Bryant Acked-by: Lance Richardson Acked-by: Aaron Conole --- Documentation/intro/install/fedora.rst | 9 ++++----- rhel/automake.mk | 1 + 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Documentation/intro/install/fedora.rst b/Documentation/intro/install/fedora.rst index ffc77a4..b5617dc 100644 --- a/Documentation/intro/install/fedora.rst +++ b/Documentation/intro/install/fedora.rst @@ -87,15 +87,14 @@ can be added: :: - $ make rpm-fedora RPMBUILD_OPT="--with dpdk" + $ make rpm-fedora RPMBUILD_OPT="--with dpdk --without check" -The above commands automatically run the Open vSwitch unit tests, which can -take several minutes. To reduce the build time by disabling the execution of -these tests, the ``--without check`` option can be added: +You can also have the above commands automatically run the Open vSwitch unit +tests. This can take several minutes. :: - $ make rpm-fedora RPMBUILD_OPT="--without check" + $ make rpm-fedora RPMBUILD_OPT="--with check" Kernel OVS Tree Datapath RPM ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/rhel/automake.mk b/rhel/automake.mk index c4f043a..1265fa7 100644 --- a/rhel/automake.mk +++ b/rhel/automake.mk @@ -55,6 +55,7 @@ $(srcdir)/rhel/openvswitch-fedora.spec: rhel/openvswitch-fedora.spec.in $(top_bu $(update_rhel_spec) RPMBUILD_TOP := $(abs_top_builddir)/rpm/rpmbuild +RPMBUILD_OPT ?= --without check # Build user-space RPMs rpm-fedora: dist $(srcdir)/rhel/openvswitch-fedora.spec