tests: reorganize tests hierarchically

Signed-off-by: Christian Franke <chris@opensourcerouting.org>

35 files changed, 128 insertions, 100 deletions

diff --git a/tests/.gitignore b/tests/.gitignore
index 3002b27149..1642fa9493 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -16,26 +16,26 @@ TAGS
 *.xml
 .arch-inventory
 .arch-ids
-aspathtest
-ecommtest
-heavy
-heavythread
-heavywq
-tabletest
-test-timer-correctness
-test-timer-performance
-testbgpcap
-testbgpmpath
-testbgpmpattr
-testbuffer
-testchecksum
-testcli
-testmemory
-testprivs
-testsegv
-testsig
-teststream
-testnexthopiter
-testcommands
-test-commands-defun.c
-site.exp
+/bgpd/test_aspath
+/bgpd/test_capability
+/bgpd/test_ecommunity
+/bgpd/test_mp_attr
+/bgpd/test_mpath
+/lib/cli/test_cli
+/lib/cli/test_commands
+/lib/cli/test_commands_defun.c
+/lib/test_buffer
+/lib/test_checksum
+/lib/test_heavy
+/lib/test_heavy_thread
+/lib/test_heavy_wq
+/lib/test_memory
+/lib/test_nexthop_iter
+/lib/test_privs
+/lib/test_srcdest_table
+/lib/test_segv
+/lib/test_sig
+/lib/test_stream
+/lib/test_table
+/lib/test_timer_correctness
+/lib/test_timer_performance
diff --git a/tests/Makefile.am b/tests/Makefile.am
index bee9feaf1e..86e432648c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,99 +1,119 @@
-AUTOMAKE_OPTIONS    = dejagnu
-DEJATOOL = libfrr
-
-SUBDIRS = \
-	bgpd.tests \
-	libfrr.tests
-
-EXTRA_DIST = \
-	config/unix.exp \
-	lib/bgpd.exp \
-	lib/libfrr.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
+AUTOMAKE_OPTIONS = subdir-objects
+AM_CPPFLAGS = \
+	-I.. \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/lib \
+	-I$(top_builddir)/lib \
+	-I$(top_srcdir)/tests/helpers/c \
+	-I$(top_builddir)/tests/helpers/c \
+	-O
 DEFS = @DEFS@ $(LOCAL_OPTS) -DSYSCONFDIR=\"$(sysconfdir)/\"
 
 if BGPD
-TESTS_BGPD = aspathtest testbgpcap ecommtest testbgpmpattr testbgpmpath
-DEJATOOL += bgpd
+TESTS_BGPD = \
+	bgpd/test_aspath \
+	bgpd/test_capability \
+	bgpd/test_ecommunity \
+	bgpd/test_mp_attr \
+	bgpd/test_mpath
 else
 TESTS_BGPD =
 endif
 
 if ENABLE_BGP_VNC
-BGP_VNC_RFP_LIB=@top_builddir@/$(LIBRFP)/librfp.a 
+BGP_VNC_RFP_LIB=@top_builddir@/$(LIBRFP)/librfp.a
 else
 BGP_VNC_RFP_LIB =
 endif
 
-check_PROGRAMS = testsig testsegv testbuffer testmemory heavy heavywq heavythread \
-		testprivs teststream testchecksum tabletest testnexthopiter \
-		testcommands test-timer-correctness test-timer-performance \
-		testcli \
-		test-srcdest-table \
-		$(TESTS_BGPD)
+check_PROGRAMS = \
+	lib/test_buffer \
+	lib/test_checksum \
+	lib/test_heavy_thread \
+	lib/test_heavy_wq \
+	lib/test_heavy \
+	lib/test_memory \
+	lib/test_nexthop_iter \
+	lib/test_privs \
+	lib/test_srcdest_table \
+	lib/test_segv \
+	lib/test_sig \
+	lib/test_stream \
+	lib/test_table \
+	lib/test_timer_correctness \
+	lib/test_timer_performance \
+	lib/cli/test_cli \
+	lib/cli/test_commands \
+	$(TESTS_BGPD)
 
 ../vtysh/vtysh_cmd.c:
 	$(MAKE) -C ../vtysh vtysh_cmd.c
 
-test-commands-defun.c: ../vtysh/vtysh_cmd.c
+lib/cli/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 = lib/cli/test_commands_defun.c
+
+noinst_HEADERS = \
+	./helpers/c/prng.h \
+	./helpers/c/tests.h \
+	./lib/cli/common_cli.h
 
-BUILT_SOURCES = test-commands-defun.c
-noinst_HEADERS = prng.h tests.h common-cli.h
+lib_test_buffer_SOURCES = lib/test_buffer.c
+lib_test_checksum_SOURCES = lib/test_checksum.c
+lib_test_heavy_thread_SOURCES = lib/test_heavy_thread.c helpers/c/main.c
+lib_test_heavy_wq_SOURCES = lib/test_heavy_wq.c helpers/c/main.c
+lib_test_heavy_SOURCES = lib/test_heavy.c helpers/c/main.c
+lib_test_memory_SOURCES = lib/test_memory.c
+lib_test_nexthop_iter_SOURCES = lib/test_nexthop_iter.c helpers/c/prng.c
+lib_test_privs_SOURCES = lib/test_privs.c
+lib_test_srcdest_table_SOURCES = lib/test_srcdest_table.c \
+                                 helpers/c/prng.c
+lib_test_segv_SOURCES = lib/test_segv.c
+lib_test_sig_SOURCES = lib/test_sig.c
+lib_test_stream_SOURCES = lib/test_stream.c
+lib_test_table_SOURCES = lib/test_table.c
+lib_test_timer_correctness_SOURCES = lib/test_timer_correctness.c \
+                                     helpers/c/prng.c
+lib_test_timer_performance_SOURCES = lib/test_timer_performance.c \
+                                     helpers/c/prng.c
+lib_cli_test_cli_SOURCES = lib/cli/test_cli.c lib/cli/common_cli.c
+lib_cli_test_commands_SOURCES = lib/cli/test_commands_defun.c \
+                                lib/cli/test_commands.c \
+                                helpers/c/prng.c
+bgpd_test_aspath_SOURCES = bgpd/test_aspath.c
+bgpd_test_capability_SOURCES = bgpd/test_capability.c
+bgpd_test_ecommunity_SOURCES = bgpd/test_ecommunity.c
+bgpd_test_mp_attr_SOURCES = bgpd/test_mp_attr.c
+bgpd_test_mpath_SOURCES = bgpd/test_mpath.c
 
-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
-teststream_SOURCES = test-stream.c
-heavy_SOURCES = heavy.c main.c
-heavywq_SOURCES = heavy-wq.c main.c
-heavythread_SOURCES = heavy-thread.c main.c
-aspathtest_SOURCES = aspath_test.c
-testbgpcap_SOURCES = bgp_capability_test.c
-ecommtest_SOURCES = ecommunity_test.c
-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
-test_srcdest_table_SOURCES = test-srcdest-table.c prng.c
+ALL_TESTS_LDADD = ../lib/libfrr.la @LIBCAP@
+BGP_TEST_LDADD = ../bgpd/libbgp.a $(BGP_VNC_RFP_LIB) $(ALL_TESTS_LDADD) -lm
 
-testcli_LDADD = ../lib/libfrr.la @LIBCAP@
-testsig_LDADD = ../lib/libfrr.la @LIBCAP@
-testsegv_LDADD = ../lib/libfrr.la @LIBCAP@
-testbuffer_LDADD = ../lib/libfrr.la @LIBCAP@
-testmemory_LDADD = ../lib/libfrr.la @LIBCAP@
-testprivs_LDADD = ../lib/libfrr.la @LIBCAP@
-teststream_LDADD = ../lib/libfrr.la @LIBCAP@
-heavy_LDADD = ../lib/libfrr.la @LIBCAP@ -lm
-heavywq_LDADD = ../lib/libfrr.la @LIBCAP@ -lm
-heavythread_LDADD = ../lib/libfrr.la @LIBCAP@ -lm
-aspathtest_LDADD = ../bgpd/libbgp.a $(BGP_VNC_RFP_LIB) ../lib/libfrr.la @LIBCAP@ -lm
-testbgpcap_LDADD = ../bgpd/libbgp.a $(BGP_VNC_RFP_LIB) ../lib/libfrr.la @LIBCAP@ -lm
-ecommtest_LDADD = ../bgpd/libbgp.a $(BGP_VNC_RFP_LIB) ../lib/libfrr.la @LIBCAP@ -lm
-testbgpmpattr_LDADD = ../bgpd/libbgp.a $(BGP_VNC_RFP_LIB) ../lib/libfrr.la @LIBCAP@ -lm
-testchecksum_LDADD = ../lib/libfrr.la @LIBCAP@ 
-testbgpmpath_LDADD = ../bgpd/libbgp.a $(BGP_VNC_RFP_LIB) ../lib/libfrr.la @LIBCAP@ -lm
-tabletest_LDADD = ../lib/libfrr.la @LIBCAP@ -lm
-testnexthopiter_LDADD = ../lib/libfrr.la @LIBCAP@
-testcommands_LDADD = ../lib/libfrr.la @LIBCAP@
-test_timer_correctness_LDADD = ../lib/libfrr.la @LIBCAP@
-test_timer_performance_LDADD = ../lib/libfrr.la @LIBCAP@
-test_srcdest_table_LDADD = ../lib/libfrr.la @LIBCAP@
+lib_test_buffer_LDADD = $(ALL_TESTS_LDADD)
+lib_test_checksum_LDADD = $(ALL_TESTS_LDADD)
+lib_test_heavy_thread_LDADD = $(ALL_TESTS_LDADD) -lm
+lib_test_heavy_wq_LDADD = $(ALL_TESTS_LDADD) -lm
+lib_test_heavy_LDADD = $(ALL_TESTS_LDADD) -lm
+lib_test_memory_LDADD = $(ALL_TESTS_LDADD)
+lib_test_nexthop_iter_LDADD = $(ALL_TESTS_LDADD)
+lib_test_privs_LDADD = $(ALL_TESTS_LDADD)
+lib_test_srcdest_table_LDADD = $(ALL_TESTS_LDADD)
+lib_test_segv_LDADD = $(ALL_TESTS_LDADD)
+lib_test_sig_LDADD = $(ALL_TESTS_LDADD)
+lib_test_stream_LDADD = $(ALL_TESTS_LDADD)
+lib_test_table_LDADD = $(ALL_TESTS_LDADD) -lm
+lib_test_timer_correctness_LDADD = $(ALL_TESTS_LDADD)
+lib_test_timer_performance_LDADD = $(ALL_TESTS_LDADD)
+lib_cli_test_cli_LDADD = $(ALL_TESTS_LDADD)
+lib_cli_test_commands_LDADD = $(ALL_TESTS_LDADD)
+bgpd_test_aspath_LDADD = $(BGP_TEST_LDADD)
+bgpd_test_capability_LDADD = $(BGP_TEST_LDADD)
+bgpd_test_ecommunity_LDADD = $(BGP_TEST_LDADD)
+bgpd_test_mp_attr_LDADD = $(BGP_TEST_LDADD)
+bgpd_test_mpath_LDADD = $(BGP_TEST_LDADD)
diff --git a/tests/aspath_test.c b/tests/bgpd/test_aspath.c
index f3999cbcff..f3999cbcff 100644
--- a/tests/aspath_test.c
+++ b/tests/bgpd/test_aspath.c
diff --git a/tests/bgp_capability_test.c b/tests/bgpd/test_capability.c
index f83dee5e1c..f83dee5e1c 100644
--- a/tests/bgp_capability_test.c
+++ b/tests/bgpd/test_capability.c
diff --git a/tests/ecommunity_test.c b/tests/bgpd/test_ecommunity.c
index 9166af6142..9166af6142 100644
--- a/tests/ecommunity_test.c
+++ b/tests/bgpd/test_ecommunity.c
diff --git a/tests/bgp_mp_attr_test.c b/tests/bgpd/test_mp_attr.c
index 397612c315..397612c315 100644
--- a/tests/bgp_mp_attr_test.c
+++ b/tests/bgpd/test_mp_attr.c
diff --git a/tests/bgp_mpath_test.c b/tests/bgpd/test_mpath.c
index f9eb1534f3..f9eb1534f3 100644
--- a/tests/bgp_mpath_test.c
+++ b/tests/bgpd/test_mpath.c
diff --git a/tests/main.c b/tests/helpers/c/main.c
index b3e6e706ff..b3e6e706ff 100644
--- a/tests/main.c
+++ b/tests/helpers/c/main.c
diff --git a/tests/prng.c b/tests/helpers/c/prng.c
index bdcfb07af1..bdcfb07af1 100644
--- a/tests/prng.c
+++ b/tests/helpers/c/prng.c
diff --git a/tests/prng.h b/tests/helpers/c/prng.h
index cf0bacc5f8..cf0bacc5f8 100644
--- a/tests/prng.h
+++ b/tests/helpers/c/prng.h
diff --git a/tests/tests.h b/tests/helpers/c/tests.h
index a528e55f05..a528e55f05 100644
--- a/tests/tests.h
+++ b/tests/helpers/c/tests.h
diff --git a/tests/common-cli.c b/tests/lib/cli/common_cli.c
index 47476711c6..83196e04aa 100644
--- a/tests/common-cli.c
+++ b/tests/lib/cli/common_cli.c
@@ -29,7 +29,7 @@
 #include "memory_vty.h"
 #include "log.h"
 
-#include "common-cli.h"
+#include "common_cli.h"
 
 struct thread_master *master;
 
diff --git a/tests/common-cli.h b/tests/lib/cli/common_cli.h
index 9c72b08e44..9c72b08e44 100644
--- a/tests/common-cli.h
+++ b/tests/lib/cli/common_cli.h
diff --git a/tests/test-cli.c b/tests/lib/cli/test_cli.c
index 0590eec713..1a316022e2 100644
--- a/tests/test-cli.c
+++ b/tests/lib/cli/test_cli.c
@@ -22,7 +22,7 @@
 
 #include <zebra.h>
 
-#include "common-cli.h"
+#include "common_cli.h"
 
 DUMMY_DEFUN(cmd0,  "arg ipv4 A.B.C.D");
 DUMMY_DEFUN(cmd1,  "arg ipv4m A.B.C.D/M");
diff --git a/tests/testcli.in b/tests/lib/cli/test_cli.in
index 5c146ef984..5c146ef984 100644
--- a/tests/testcli.in
+++ b/tests/lib/cli/test_cli.in
diff --git a/tests/testcli.refout b/tests/lib/cli/test_cli.refout
index 8b438baee2..8b438baee2 100644
--- a/tests/testcli.refout
+++ b/tests/lib/cli/test_cli.refout
diff --git a/tests/test-commands.c b/tests/lib/cli/test_commands.c
index 272e3d12b7..272e3d12b7 100644
--- a/tests/test-commands.c
+++ b/tests/lib/cli/test_commands.c
diff --git a/tests/testcommands.in b/tests/lib/cli/test_commands.in
index 7fe62799f1..7fe62799f1 100644
--- a/tests/testcommands.in
+++ b/tests/lib/cli/test_commands.in
diff --git a/tests/testcommands.refout b/tests/lib/cli/test_commands.refout
index 9d4a6ef03e..9d4a6ef03e 100644
--- a/tests/testcommands.refout
+++ b/tests/lib/cli/test_commands.refout
diff --git a/tests/test-buffer.c b/tests/lib/test_buffer.c
index 67e4035806..67e4035806 100644
--- a/tests/test-buffer.c
+++ b/tests/lib/test_buffer.c
diff --git a/tests/test-checksum.c b/tests/lib/test_checksum.c
index 53ab260e26..53ab260e26 100644
--- a/tests/test-checksum.c
+++ b/tests/lib/test_checksum.c
diff --git a/tests/heavy.c b/tests/lib/test_heavy.c
index 6ba8d9aa6d..6ba8d9aa6d 100644
--- a/tests/heavy.c
+++ b/tests/lib/test_heavy.c
diff --git a/tests/heavy-thread.c b/tests/lib/test_heavy_thread.c
index c43fa76c0e..c43fa76c0e 100644
--- a/tests/heavy-thread.c
+++ b/tests/lib/test_heavy_thread.c
diff --git a/tests/heavy-wq.c b/tests/lib/test_heavy_wq.c
index 97371face1..97371face1 100644
--- a/tests/heavy-wq.c
+++ b/tests/lib/test_heavy_wq.c
diff --git a/tests/test-memory.c b/tests/lib/test_memory.c
index 6849b9dceb..6849b9dceb 100644
--- a/tests/test-memory.c
+++ b/tests/lib/test_memory.c
diff --git a/tests/test-nexthop-iter.c b/tests/lib/test_nexthop_iter.c
index 250379329b..250379329b 100644
--- a/tests/test-nexthop-iter.c
+++ b/tests/lib/test_nexthop_iter.c
diff --git a/tests/test-privs.c b/tests/lib/test_privs.c
index c6ccc28e7a..c6ccc28e7a 100644
--- a/tests/test-privs.c
+++ b/tests/lib/test_privs.c
diff --git a/tests/test-segv.c b/tests/lib/test_segv.c
index 1810c5f4b2..1810c5f4b2 100644
--- a/tests/test-segv.c
+++ b/tests/lib/test_segv.c
diff --git a/tests/test-sig.c b/tests/lib/test_sig.c
index 4a04240303..4a04240303 100644
--- a/tests/test-sig.c
+++ b/tests/lib/test_sig.c
diff --git a/tests/test-srcdest-table.c b/tests/lib/test_srcdest_table.c
index cfc2deb8d6..cfc2deb8d6 100644
--- a/tests/test-srcdest-table.c
+++ b/tests/lib/test_srcdest_table.c
diff --git a/tests/test-stream.c b/tests/lib/test_stream.c
index 3ac45eb203..3ac45eb203 100644
--- a/tests/test-stream.c
+++ b/tests/lib/test_stream.c
diff --git a/tests/lib/test_stream.refout b/tests/lib/test_stream.refout
new file mode 100644
index 0000000000..cf52e1301e
--- /dev/null
+++ b/tests/lib/test_stream.refout
@@ -0,0 +1,8 @@
+endp: 15, readable: 15, writeable: 1009
+0xef 0xbe 0xef 0xde 0xad 0xbe 0xef 0xde 0xad 0xbe 0xef 0xde 0xad 0xbe 0xef 
+endp: 15, readable: 15, writeable: 0
+0xef 0xbe 0xef 0xde 0xad 0xbe 0xef 0xde 0xad 0xbe 0xef 0xde 0xad 0xbe 0xef 
+c: 0xef
+w: 0xbeef
+l: 0xdeadbeef
+q: 0xdeadbeefdeadbeef
diff --git a/tests/table_test.c b/tests/lib/test_table.c
index 4042e1aaa2..4042e1aaa2 100644
--- a/tests/table_test.c
+++ b/tests/lib/test_table.c
diff --git a/tests/test-timer-correctness.c b/tests/lib/test_timer_correctness.c
index e523929be1..e523929be1 100644
--- a/tests/test-timer-correctness.c
+++ b/tests/lib/test_timer_correctness.c
diff --git a/tests/test-timer-performance.c b/tests/lib/test_timer_performance.c
index a7d09beecc..a7d09beecc 100644
--- a/tests/test-timer-performance.c
+++ b/tests/lib/test_timer_performance.c