--- embedaddon/quagga/tests/Makefile.am	2013/07/21 23:54:40	1.1.1.3
+++ embedaddon/quagga/tests/Makefile.am	2016/11/02 10:09:12	1.1.1.4
@@ -1,14 +1,53 @@
-INCLUDES = @INCLUDES@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib
+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 \
+	testcli.refout
+
+AM_CPPFLAGS = -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib
 DEFS = @DEFS@ $(LOCAL_OPTS) -DSYSCONFDIR=\"$(sysconfdir)/\"
 
-AM_CFLAGS = $(PICFLAGS)
-AM_LDFLAGS = $(PILDFLAGS)
+if BGPD
+TESTS_BGPD = aspathtest testbgpcap ecommtest testbgpmpattr testbgpmpath
+DEJATOOL += bgpd
+else
+TESTS_BGPD =
+endif
 
-noinst_PROGRAMS = testsig testbuffer testmemory heavy heavywq heavythread \
-		aspathtest testprivs teststream testbgpcap ecommtest \
-		testbgpmpattr testchecksum testbgpmpath tabletest
+check_PROGRAMS = testsig testsegv testbuffer testmemory heavy heavywq heavythread \
+		testprivs teststream testchecksum tabletest testnexthopiter \
+		testcommands test-timer-correctness test-timer-performance \
+		testcli \
+		$(TESTS_BGPD)
 
+../vtysh/vtysh_cmd.c:
+	$(MAKE) -C ../vtysh vtysh_cmd.c
+
+test-commands-defun.c: ../vtysh/vtysh_cmd.c
+	sed \
+		-e 's/"vtysh\.h"/"tests.h"/' \
+		-e 's/vtysh_init_cmd/test_init_cmd/' \
+		-e 's/VTYSH_[A-Z][A-Z_0-9]*/0/g' \
+		< ../vtysh/vtysh_cmd.c \
+		> test-commands-defun.c
+
+BUILT_SOURCES = test-commands-defun.c
+noinst_HEADERS = prng.h tests.h common-cli.h
+
+testcli_SOURCES = test-cli.c common-cli.c
 testsig_SOURCES = test-sig.c
+testsegv_SOURCES = test-segv.c
 testbuffer_SOURCES = test-buffer.c
 testmemory_SOURCES = test-memory.c
 testprivs_SOURCES = test-privs.c
@@ -23,8 +62,14 @@ testbgpmpattr_SOURCES =  bgp_mp_attr_test.c
 testchecksum_SOURCES = test-checksum.c
 testbgpmpath_SOURCES = bgp_mpath_test.c
 tabletest_SOURCES = table_test.c
+testnexthopiter_SOURCES = test-nexthop-iter.c prng.c
+testcommands_SOURCES = test-commands-defun.c test-commands.c prng.c
+test_timer_correctness_SOURCES = test-timer-correctness.c prng.c
+test_timer_performance_SOURCES = test-timer-performance.c prng.c
 
+testcli_LDADD = ../lib/libzebra.la @LIBCAP@
 testsig_LDADD = ../lib/libzebra.la @LIBCAP@
+testsegv_LDADD = ../lib/libzebra.la @LIBCAP@
 testbuffer_LDADD = ../lib/libzebra.la @LIBCAP@
 testmemory_LDADD = ../lib/libzebra.la @LIBCAP@
 testprivs_LDADD = ../lib/libzebra.la @LIBCAP@
@@ -39,3 +84,7 @@ testbgpmpattr_LDADD = ../bgpd/libbgp.a ../lib/libzebra
 testchecksum_LDADD = ../lib/libzebra.la @LIBCAP@ 
 testbgpmpath_LDADD = ../bgpd/libbgp.a ../lib/libzebra.la @LIBCAP@ -lm
 tabletest_LDADD = ../lib/libzebra.la @LIBCAP@ -lm
+testnexthopiter_LDADD = ../lib/libzebra.la @LIBCAP@
+testcommands_LDADD = ../lib/libzebra.la @LIBCAP@
+test_timer_correctness_LDADD = ../lib/libzebra.la @LIBCAP@
+test_timer_performance_LDADD = ../lib/libzebra.la @LIBCAP@