From 98a59492d9152df8c93612d2d12f170b5c034189 Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Thu, 1 Aug 2013 08:12:25 +0000 Subject: [PATCH] build: remove now-useless --{en, dis}able-tests 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 Signed-off-by: David Lamparter --- Makefile.am | 2 +- configure.ac | 10 ---------- doc/install.texi | 6 ------ 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/Makefile.am b/Makefile.am index 37fea43b7..6916470bd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 \ diff --git a/configure.ac b/configure.ac index 8964006a8..f9b176350 100755 --- a/configure.ac +++ b/configure.ac @@ -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, @@ -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 -------------------- @@ -1372,7 +1363,6 @@ else fi AC_SUBST(DOC) -AC_SUBST(BUILD_TESTS) AC_SUBST(ZEBRA) AC_SUBST(BGPD) AC_SUBST(RIPD) diff --git a/doc/install.texi b/doc/install.texi index 1e8d965bc..e958d845f 100644 --- a/doc/install.texi +++ b/doc/install.texi @@ -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