X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftestbed%2FMakefile.am;h=1428106a5173c4164f98e9fb4d0282bf6361a8be;hb=0f7e55e885e3d9c4e26432b53cf2cfe120df7cf5;hp=841a7f99245307662fb7b16dcd7bcc3c83bbcce0;hpb=302168de1e43aec3d2d2dfe3fd6707b0f3f68300;p=oweals%2Fgnunet.git diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am index 841a7f992..1428106a5 100644 --- a/src/testbed/Makefile.am +++ b/src/testbed/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_srcdir)/src/include +AM_CPPFLAGS = -I$(top_srcdir)/src/include if MINGW WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols @@ -9,15 +9,6 @@ if USE_COVERAGE XLIB = -lgcov endif -if WITH_LL - CC = mpcc - ll_noinst_binaries = \ - ll-master \ - ll-monitor - ll_binaries = \ - gnunet-mpi-test -endif - libexecdir= $(pkglibdir)/libexec/ pkgcfgdir= $(pkgdatadir)/config.d/ @@ -25,31 +16,51 @@ pkgcfgdir= $(pkgdatadir)/config.d/ pkgcfg_DATA = \ testbed.conf +if HAVE_SQLITE + underlay_daemon = gnunet-daemon-testbed-underlay + latency_logger = gnunet-daemon-latency-logger + generate_underlay = generate-underlay-topology + underlay_testcases = test_testbed_underlay +endif + libexec_PROGRAMS = \ gnunet-service-testbed \ - gnunet-helper-testbed + gnunet-helper-testbed \ + gnunet-service-testbed-logger \ + gnunet-daemon-testbed-blacklist \ + $(underlay_daemon) \ + $(latency_logger) bin_PROGRAMS = \ - $(ll_binaries) + gnunet-testbed-profiler noinst_PROGRAMS = \ - gnunet-testbed-profiler \ - $(ll_noinst_binaries) + $(generate_underlay) gnunet_service_testbed_SOURCES = \ - gnunet-service-testbed.c \ - gnunet-service-testbed.h \ - gnunet-service-testbed_hc.c + gnunet-service-testbed.c gnunet-service-testbed.h \ + gnunet-service-testbed_links.c gnunet-service-testbed_links.h \ + gnunet-service-testbed_peers.c \ + gnunet-service-testbed_cache.c \ + gnunet-service-testbed_oc.c \ + gnunet-service-testbed_cpustatus.c \ + gnunet-service-testbed_meminfo.c gnunet-service-testbed_meminfo.h \ + gnunet-service-testbed_barriers.c gnunet-service-testbed_barriers.h \ + gnunet-service-testbed_connectionpool.c gnunet-service-testbed_connectionpool.h gnunet_service_testbed_LDADD = $(XLIB) \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/core/libgnunetcore.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/testbed/libgnunettestbed.la \ - $(LTLIBINTL) -lz -gnunet_service_testbed_DEPENDENCIES = \ - libgnunettestbed.la + libgnunettestbed.la \ + $(top_builddir)/src/arm/libgnunetarm.la \ + $(LTLIBINTL) $(Z_LIBS) + +gnunet_service_testbed_logger_SOURCES = \ + gnunet-service-testbed-logger.c +gnunet_service_testbed_logger_LDADD = \ + $(top_builddir)/src/util/libgnunetutil.la gnunet_testbed_profiler_SOURCES = \ gnunet-testbed-profiler.c @@ -63,28 +74,29 @@ gnunet_helper_testbed_LDADD = $(XLIB) \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testing/libgnunettesting.la \ libgnunettestbed.la \ - $(LTLIBINTL) -lz -gnunet_helper_testbed_DEPENDENCIES = \ - gnunet-service-testbed.$(OBJEXT) \ - libgnunettestbed.la + $(LTLIBINTL) $(Z_LIBS) -ll_master_SOURCES = \ - ll_master.c -ll_master_LDADD = $(XLIB) \ +gnunet_daemon_testbed_blacklist_SOURCES = gnunet-daemon-testbed-blacklist.c +gnunet_daemon_testbed_blacklist_LDADD = $(XLIB) \ + $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(LTLIBINTL) -lz -lllapi + $(LTLIBINTL) -ll_monitor_SOURCES = \ - ll_monitor.c -ll_monitor_LDADD = $(XLIB) \ - $(LTLIBINTL) -lz -lllapi +gnunet_daemon_testbed_underlay_SOURCES = gnunet-daemon-testbed-underlay.c +gnunet_daemon_testbed_underlay_LDADD = $(XLIB) \ + $(top_builddir)/src/transport/libgnunettransport.la \ + $(top_builddir)/src/util/libgnunetutil.la \ + $(LTLIBINTL) -lsqlite3 -gnunet_mpi_test_SOURCES = gnunet_mpi_test.c -gnunet_mpi_test_LDADD = \ - $(top_builddir)/src/util/libgnunetutil.la +gnunet_daemon_latency_logger_SOURCES = gnunet-daemon-latency-logger.c +gnunet_daemon_latency_logger_LDADD = $(XLIB) \ + $(top_builddir)/src/ats/libgnunetats.la \ + $(top_builddir)/src/util/libgnunetutil.la \ + $(LTLIBINTL) -lsqlite3 lib_LTLIBRARIES = \ - libgnunettestbed.la + libgnunettestbed.la \ + libgnunettestbedlogger.la libgnunettestbed_la_SOURCES = \ testbed_api.c testbed_api.h testbed.h \ @@ -95,7 +107,9 @@ libgnunettestbed_la_SOURCES = \ testbed_api_statistics.c \ testbed_api_testbed.c \ testbed_api_test.c \ - testbed_api_topology.c testbed_api_topology.h + testbed_api_topology.c testbed_api_topology.h \ + testbed_api_sd.c testbed_api_sd.h \ + testbed_api_barriers.c testbed_api_barriers.h libgnunettestbed_la_LIBADD = $(XLIB) \ $(top_builddir)/src/core/libgnunetcore.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ @@ -109,16 +123,36 @@ libgnunettestbed_la_LDFLAGS = \ $(GN_LIB_LDFLAGS) \ -version-info 0:0:0 +libgnunettestbedlogger_la_SOURCES = \ + testbed_logger_api.c +libgnunettestbedlogger_la_LIBADD = $(XLIB) \ + $(top_builddir)/src/util/libgnunetutil.la \ + $(LTLIBINTL) +libgnunettestbedlogger_la_LDFLAGS = \ + $(GN_LIB_LDFLAGS) \ + -version-info 0:0:0 + +generate_underlay_topology_SOURCES = generate-underlay-topology.c +generate_underlay_topology_LDADD = $(XLIB) \ + $(top_builddir)/src/util/libgnunetutil.la \ + libgnunettestbed.la \ + $(LTLIBINTL) -lsqlite3 + check_PROGRAMS = \ test_testbed_api_hosts \ + test_testbed_logger_api \ + test_gnunet_helper_testbed \ test_testbed_api_controllerlink \ test_testbed_api_2peers_1controller \ test_testbed_api_3peers_3controllers \ test_testbed_api \ + test_testbed_api_sd \ test_testbed_api_operations \ test_testbed_api_testbed_run \ test_testbed_api_test \ - test_gnunet_helper_testbed \ + test_testbed_api_test_timeout \ + test_testbed_api_peer_reconfiguration \ + test_testbed_api_peers_manage_services \ test_testbed_api_topology \ test_testbed_api_topology_clique \ test_testbed_api_testbed_run_topologyrandom \ @@ -129,30 +163,44 @@ check_PROGRAMS = \ test_testbed_api_testbed_run_topology2dtorus \ test_testbed_api_testbed_run_topologysmallworld \ test_testbed_api_testbed_run_topologyfromfile \ - test_testbed_api_testbed_run_topologyscalefree + test_testbed_api_testbed_run_topologyscalefree \ + test_testbed_api_testbed_run_waitforever \ + test_testbed_api_statistics \ + gnunet-service-test-barriers \ + test_testbed_api_barriers \ + $(underlay_testcases) if ENABLE_TEST_RUN + AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = \ test_testbed_api \ - test_testbed_api_hosts \ - test_testbed_api_2peers_1controller \ - test_testbed_api_3peers_3controllers \ + test_testbed_logger_api \ + test_testbed_api_sd \ test_testbed_api_operations \ + test_testbed_api_hosts \ test_gnunet_helper_testbed \ + test_testbed_api_2peers_1controller \ test_testbed_api_controllerlink \ + test_testbed_api_3peers_3controllers \ test_testbed_api_testbed_run \ test_testbed_api_test \ + test_testbed_api_test_timeout \ + test_testbed_api_statistics \ + test_testbed_api_peer_reconfiguration \ + test_testbed_api_peers_manage_services \ test_testbed_api_topology \ test_testbed_api_topology_clique \ test_testbed_api_testbed_run_topologyrandom \ test_testbed_api_testbed_run_topologyline \ test_testbed_api_testbed_run_topologyclique \ test_testbed_api_testbed_run_topologyring \ - test_testbed_api_testbed_run_topologysmallworldring \ test_testbed_api_testbed_run_topology2dtorus \ test_testbed_api_testbed_run_topologysmallworld \ + test_testbed_api_testbed_run_topologysmallworldring \ test_testbed_api_testbed_run_topologyfromfile \ - test_testbed_api_testbed_run_topologyscalefree + test_testbed_api_testbed_run_topologyscalefree \ + test_testbed_api_barriers \ + $(underlay_testcases) endif test_testbed_api_hosts_SOURCES = \ @@ -166,7 +214,20 @@ test_testbed_api_SOURCES = \ test_testbed_api_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/dht/libgnunetdht.la \ + $(top_builddir)/src/arm/libgnunetarm.la \ + libgnunettestbed.la + +test_testbed_logger_api_SOURCES = \ + test_testbed_logger_api.c +test_testbed_logger_api_LDADD = \ + $(top_builddir)/src/util/libgnunetutil.la \ + $(top_builddir)/src/testing/libgnunettesting.la \ + libgnunettestbedlogger.la + +test_testbed_api_sd_SOURCES = \ + test_testbed_api_sd.c +test_testbed_api_sd_LDADD = \ + $(top_builddir)/src/util/libgnunetutil.la \ libgnunettestbed.la test_testbed_api_2peers_1controller_SOURCES = \ @@ -207,6 +268,12 @@ test_testbed_api_test_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ libgnunettestbed.la +test_testbed_api_test_timeout_SOURCES = \ + test_testbed_api_test_timeout.c +test_testbed_api_test_timeout_LDADD = \ + $(top_builddir)/src/util/libgnunetutil.la \ + libgnunettestbed.la + test_testbed_api_topology_SOURCES = \ test_testbed_api_topology.c test_testbed_api_topology_LDADD = \ @@ -224,7 +291,7 @@ test_gnunet_helper_testbed_SOURCES = \ test_gnunet_helper_testbed_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ libgnunettestbed.la \ - -lz + $(Z_LIBS) test_testbed_api_testbed_run_topologyrandom_SOURCES = \ test_testbed_api_testbed_run.c @@ -280,8 +347,56 @@ test_testbed_api_testbed_run_topologyscalefree_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ libgnunettestbed.la +test_testbed_api_testbed_run_waitforever_SOURCES = \ + test_testbed_api_testbed_run.c +test_testbed_api_testbed_run_waitforever_LDADD = \ + $(top_builddir)/src/util/libgnunetutil.la \ + libgnunettestbed.la + +test_testbed_api_statistics_SOURCES = \ + test_testbed_api_statistics.c +test_testbed_api_statistics_LDADD = \ + $(top_builddir)/src/util/libgnunetutil.la \ + libgnunettestbed.la + +test_testbed_api_peers_manage_services_SOURCES = \ + test_testbed_api_peers_manage_services.c +test_testbed_api_peers_manage_services_LDADD = \ + $(top_builddir)/src/util/libgnunetutil.la \ + libgnunettestbed.la + +test_testbed_api_peer_reconfiguration_SOURCES = \ + test_testbed_api_peer_reconfiguration.c +test_testbed_api_peer_reconfiguration_LDADD = \ + $(top_builddir)/src/util/libgnunetutil.la \ + libgnunettestbed.la + +test_testbed_api_barriers_SOURCES = \ + test_testbed_api_barriers.c \ + test_testbed_api_barriers.h +test_testbed_api_barriers_LDADD = \ + $(top_builddir)/src/util/libgnunetutil.la \ + libgnunettestbed.la + +gnunet_service_test_barriers_SOURCES = \ + gnunet-service-test-barriers.c \ + test_testbed_api_barriers.h +gnunet_service_test_barriers_LDADD = \ + $(top_builddir)/src/util/libgnunetutil.la \ + libgnunettestbed.la + +test_testbed_underlay_SOURCES = \ + test_testbed_underlay.c +test_testbed_underlay_LDADD = \ + $(top_builddir)/src/util/libgnunetutil.la \ + libgnunettestbed.la + EXTRA_DIST = \ test_testbed_api.conf \ + test_testbed_api_statistics.conf \ + test_testbed_api_test_timeout.conf \ + test_testbed_api_template.conf \ + test_testbed_logger_api.conf \ test_testbed_api_testbed_run_topologyring.conf \ test_testbed_api_testbed_run_topologyclique.conf \ test_testbed_api_testbed_run_topologyline.conf \ @@ -291,6 +406,9 @@ EXTRA_DIST = \ test_testbed_api_testbed_run_topologysmallworld.conf \ test_testbed_api_testbed_run_topologyfromfile.conf \ test_testbed_api_testbed_run_topologyscalefree.conf \ + test_testbed_api_barriers.conf.in \ overlay_topology.txt \ sample_hosts.txt \ - sample.job + sample.job \ + test_testbed_underlay.conf.in \ + test-underlay.sqlite