X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=Makefile.am;h=2e16e5c542d6c02ebed6e072bca9ee4057a3700a;hp=85f8da8a7345cf3d7dc8d54ca156eed07a60bbd0;hb=e91e6e68e46419e84c234561ceaed36972f69946;hpb=090afcd01854ef4af46064fe59c0bf71ec83d345 diff --git a/Makefile.am b/Makefile.am index 85f8da8a..2e16e5c5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -159,8 +159,7 @@ check_PROGRAMS = \ test_utils_time \ test_utils_vl_lookup \ test_libcollectd_network_parse \ - test_utils_config_cores \ - test_utils_proc_pids + test_utils_config_cores TESTS = $(check_PROGRAMS) @@ -277,7 +276,7 @@ collectd_LDFLAGS += -ldl -Wl,--out-implib,libcollectd.a else collectd_SOURCES += src/daemon/cmd.c endif - + if BUILD_FEATURE_DAEMON collectd_CPPFLAGS += -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"' endif @@ -377,11 +376,6 @@ test_utils_config_cores_SOURCES = \ src/testing.h test_utils_config_cores_LDADD = libplugin_mock.la -test_utils_proc_pids_SOURCES = \ - src/utils/proc_pids/proc_pids_test.c \ - src/testing.h -test_utils_proc_pids_LDADD = libplugin_mock.la - libavltree_la_SOURCES = \ src/utils/avltree/avltree.c \ src/utils/avltree/avltree.h @@ -1090,6 +1084,13 @@ test_plugin_intel_rdt_LDFLAGS = $(PLUGIN_LDFLAGS) test_plugin_intel_rdt_LDADD = liboconfig.la libplugin_mock.la check_PROGRAMS += test_plugin_intel_rdt TESTS += test_plugin_intel_rdt + +test_utils_proc_pids_SOURCES = \ + src/utils/proc_pids/proc_pids_test.c \ + src/testing.h +test_utils_proc_pids_LDADD = libplugin_mock.la +check_PROGRAMS += test_utils_proc_pids +TESTS += test_utils_proc_pids endif if BUILD_PLUGIN_INTERFACE @@ -1390,6 +1391,21 @@ network_la_CPPFLAGS += $(GCRYPT_CPPFLAGS) network_la_LDFLAGS += $(GCRYPT_LDFLAGS) network_la_LIBADD += $(GCRYPT_LIBS) endif + +test_plugin_network_SOURCES = \ + src/network_test.c \ + src/utils_fbhash.c \ + src/daemon/configfile.c \ + src/daemon/types_list.c +test_plugin_network_CPPFLAGS = $(AM_CPPFLAGS) $(GCRYPT_CPPFLAGS) +test_plugin_network_LDFLAGS = $(PLUGIN_LDFLAGS) $(GCRYPT_LDFLAGS) +test_plugin_network_LDADD = \ + libavltree.la \ + liboconfig.la \ + libplugin_mock.la \ + libmetadata.la \ + $(GCRYPT_LIBS) +check_PROGRAMS += test_plugin_network endif if BUILD_PLUGIN_NFS