Skip to content

Commit

Permalink
build: remove now-useless --{en, dis}able-tests
Browse files Browse the repository at this point in the history
commit d771020 "don't build tests unless make check is run" has made the
 --{en,dis}able-tests switch completely useless.  The differentiation is
now made by running "make check" or not doing so.  The only effect of
the switch is an "empty" excursion of make into the tests/ directory.

(well, and it turns "make check" useless from the main directory if
 --disable-tests is given, which I don't think makes sense either)

Acked-by: Greg Troxel <[email protected]>
Signed-off-by: David Lamparter <[email protected]>
  • Loading branch information
eqvinox committed Apr 1, 2014
1 parent 8c99b4c commit 98a5949
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 17 deletions.
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

SUBDIRS = lib @ZEBRA@ @BGPD@ @RIPD@ @RIPNGD@ @OSPFD@ @OSPF6D@ @BABELD@ \
@ISISD@ @WATCHQUAGGA@ @VTYSH@ @OSPFCLIENT@ @DOC@ m4 @pkgsrcdir@ \
redhat @SOLARIS@ @BUILD_TESTS@
redhat @SOLARIS@ tests

DIST_SUBDIRS = lib zebra bgpd ripd ripngd ospfd ospf6d babeld \
isisd watchquagga vtysh ospfclient doc m4 pkgsrc redhat tests \
Expand Down
10 changes: 0 additions & 10 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,6 @@ AC_ARG_ENABLE(ipv6,
[ --disable-ipv6 turn off IPv6 related features and daemons])
AC_ARG_ENABLE(doc,
[ --disable-doc do not build docs])
AC_ARG_ENABLE(tests,
[ --disable-tests do not build tests])
AC_ARG_ENABLE(zebra,
[ --disable-zebra do not build zebra daemon])
AC_ARG_ENABLE(bgpd,
Expand Down Expand Up @@ -1272,13 +1270,6 @@ else
DOC="doc"
fi

dnl can't use TESTS as name, that's special with automake
if test "${enable_tests}" = "no";then
BUILD_TESTS=""
else
BUILD_TESTS="tests"
fi

dnl --------------------
dnl Daemon disable check
dnl --------------------
Expand Down Expand Up @@ -1372,7 +1363,6 @@ else
fi

AC_SUBST(DOC)
AC_SUBST(BUILD_TESTS)
AC_SUBST(ZEBRA)
AC_SUBST(BGPD)
AC_SUBST(RIPD)
Expand Down
6 changes: 0 additions & 6 deletions doc/install.texi
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,6 @@ Enable support for Equal Cost Multipath. @var{ARG} is the maximum number
of ECMP paths to allow, set to 0 to allow unlimited number of paths.
@item --disable-rtadv
Disable support IPV6 router advertisement in zebra.
@item --disable-tests
Do not build tests. Test programs are built by default, but not ran or
installed. They can be excluded from build with this option, which will
minimally decrease compile time and overhead. They can always be built and
executed at a later time by running @command{make check} in the @file{tests/}
subdirectory, even if they're excluded from build.
@item --enable-gcc-rdynamic
Pass the @command{-rdynamic} option to the linker driver. This is in most
cases neccessary for getting usable backtraces. This option defaults to on
Expand Down

0 comments on commit 98a5949

Please sign in to comment.