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 <russ...@ovn.org>
---
 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
-- 
2.9.3

_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Reply via email to