Merge tag 'upstream/1.2.3'

[quagga-debian.git] / tests / Makefile.am

diff --git a/tests/Makefile.am b/tests/Makefile.am
index b13e903dc006210862669341a3946ccfa5795cc6..47700810d1c494b689782372f533594c0118b2dc 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,15 +1,5 @@
-AUTOMAKE_OPTIONS    = dejagnu
-DEJATOOL = libzebra
-
-SUBDIRS = \
-       bgpd.tests \
-       libzebra.tests
 
 EXTRA_DIST = \
-       config/unix.exp \
-       lib/bgpd.exp \
-       lib/libzebra.exp \
-       global-conf.exp \
        testcommands.in \
        testcommands.refout \
        testcli.in \
@@ -20,7 +10,6 @@ DEFS = @DEFS@ $(LOCAL_OPTS) -DSYSCONFDIR=\"$(sysconfdir)/\"
 
 if BGPD
 TESTS_BGPD = aspathtest testbgpcap ecommtest testbgpmpattr testbgpmpath
-DEJATOOL += bgpd
 else
 TESTS_BGPD =
 endif
@@ -31,6 +20,10 @@ check_PROGRAMS = testsig testsegv testbuffer testmemory heavy heavywq heavythrea
                testcli \
                $(TESTS_BGPD)
 
+TESTS = $(TESTS_BGPD) teststream tabletest testmemory testnexthopiter \
+       test-timer-correctness tabletest
+
+
 ../vtysh/vtysh_cmd.c:
        $(MAKE) -C ../vtysh vtysh_cmd.c