t: cleanup the testing suite

We now test the testing suite properly, with "make check". Also having
the listplugins isn't used anymore as it is not part of the program
install, but configuration of an eventual package

Also, we don't want to require any execution for non test make targets,
as it would cause issues with cross compilation.

If cross-testing needs to be done, it obviously needs some extensive
hand-holding.

Author: steveschnepp

.gitignore

@@ -3,6 +3,8 @@
 *.1
 *~
 *.bak
+*.log
+*.trs
 .deps
 .dirstamp
 .gdbinit
@@ -20,3 +22,5 @@ TAGS
 /plugins/
 /munin-node-c
 /munin-plugins-c
+/t/p/
+!/t/p/*.c

Makefile.am

@@ -15,13 +15,9 @@ ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = src/node src/plugins t
 
 dist_doc_DATA = gpl-2.0.txt gpl-3.0.txt
-EXTRA_DIST = README.rst getversion
+EXTRA_DIST = README.rst getversion t/plugin_list t/node_list
 
-all-local: $(pkglibexec_PROGRAMS)
-	$(MKDIR_P) plugins
-	for l in `./src/plugins/munin-plugins-c$(EXEEXT) listplugins`; do \
-		test -L plugins/$$l$(EXEEXT) || $(LN_S) ../src/plugins/munin-plugins-c$(EXEEXT) plugins/$$l$(EXEEXT); \
-	done
+TESTS = t/plugin_list t/node_list
 
 clean-local:
 	rm -rf plugins

src/plugins/Makefile.am

@@ -15,23 +15,23 @@ munin_plugins_c_SOURCES = \
 	common.c \
 	common.h \
 	plugins.h \
-	cpu.c \
-	df.c \
-	entropy.c \
-	external_.c \
-	forks.c \
-	fw_packets.c \
-	if_err_.c \
-	interrupts.c \
-	iostat.c \
-	load.c \
-	open_files.c \
-	open_inodes.c \
-	processes.c \
-	swap.c \
-	threads.c \
-	memory.c \
-	uptime.c \
+	p/cpu.c \
+	p/df.c \
+	p/entropy.c \
+	p/external_.c \
+	p/forks.c \
+	p/fw_packets.c \
+	p/if_err_.c \
+	p/interrupts.c \
+	p/iostat.c \
+	p/load.c \
+	p/open_files.c \
+	p/open_inodes.c \
+	p/processes.c \
+	p/swap.c \
+	p/threads.c \
+	p/memory.c \
+	p/uptime.c \
 	main.c
 man_MANS = munin-plugins-c.1
 CLEANFILES = $(man_MANS)

src/plugins/cpu.c renamed to src/plugins/p/cpu.c

@@ -7,6 +7,6 @@
 
 include $(top_srcdir)/common.am
 
-sbin_PROGRAMS = ok_plugin nb_env
-ok_plugin_SOURCES = ok_plugin.c common.c common.h
-nb_env_SOURCES = nb_env.c common.c common.h
+check_PROGRAMS = p/ok_plugin p/nb_env
+p_ok_plugin_SOURCES = p/ok_plugin.c common.c common.h
+p_nb_env_SOURCES = p/nb_env.c common.c common.h

src/plugins/df.c renamed to src/plugins/p/df.c

@@ -0,0 +1,8 @@
+#! /bin/sh
+
+# lauching the list of testing
+echo list | src/node/munin-node-c -d t/p -D t.conf
+
+#
+echo config nb_env | src/node/munin-node-c -d t/p -D t.conf
+echo fetch nb_env | src/node/munin-node-c -d t/p -D t.conf

src/plugins/entropy.c renamed to src/plugins/p/entropy.c

@@ -0,0 +1,3 @@
+#! /bin/sh
+
+src/plugins/munin-plugins-c listplugins