Skip to content

Commit

Permalink
build: Don't run tests in rpm makefile targets.
Browse files Browse the repository at this point in the history
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 <[email protected]>
Acked-by: Lance Richardson <[email protected]>
Acked-by: Aaron Conole <[email protected]>
  • Loading branch information
russellb committed May 3, 2017
1 parent d2c0927 commit fb876c9
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
9 changes: 4 additions & 5 deletions Documentation/intro/install/fedora.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down
1 change: 1 addition & 0 deletions rhel/automake.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit fb876c9

Please sign in to comment.