X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftransport%2FMakefile.am;h=950b0a9a031278380d28385f47109cebc76e3d62;hb=f0a8d26b26cda04518e3555373172f6b4940e489;hp=dd7bedbaef9bc560ba08c62edd22ab6ae198a1a9;hpb=83995cf89e0515b46d65badd09b641c988a5ea9d;p=oweals%2Fgnunet.git diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index dd7bedbae..950b0a9a0 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am @@ -1,3 +1,4 @@ +# This Makefile.am is in the public domain AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include plugindir = $(libdir)/gnunet @@ -95,7 +96,7 @@ endif if LINUX install-exec-hook: $(top_srcdir)/src/transport/install-wlan-helper.sh $(libexecdir) $(SUDO_BINARY) || true -if HAVE_LIBBLUETOOTH +if HAVE_LIBBLUETOOTH $(top_srcdir)/src/transport/install-bluetooth-helper.sh $(libexecdir) $(SUDO_BINARY) || true endif else @@ -151,13 +152,11 @@ lib_LTLIBRARIES = \ libgnunettransporttesting_la_SOURCES = \ transport-testing.c transport-testing.h libgnunettransporttesting_la_LIBADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testing/libgnunettesting.la \ $(GN_LIBINTL) -libgnunettransporttesting_la_DEPENDENCIES = \ - libgnunettransport.la libgnunettransporttesting_la_LDFLAGS = \ $(GN_LIB_LDFLAGS) @@ -166,9 +165,11 @@ libgnunettransport_la_SOURCES = \ transport_api_blacklist.c \ transport_api_address_to_string.c \ transport_api_monitor_peers.c \ + transport_api_monitor_plugins.c \ transport_api_monitor_validation.c libgnunettransport_la_LIBADD = \ $(top_builddir)/src/hello/libgnunethello.la \ + $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) libgnunettransport_la_LDFLAGS = \ @@ -224,27 +225,24 @@ endif gnunet_transport_profiler_SOURCES = \ gnunet-transport-profiler.c gnunet_transport_profiler_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/nat/libgnunetnat.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) -gnunet_transport_profiler_DEPENDENCIES = \ - libgnunettransport.la gnunet_transport_SOURCES = \ gnunet-transport.c gnunet_transport_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/nat/libgnunetnat.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) -gnunet_transport_DEPENDENCIES = \ - libgnunettransport.la gnunet_service_transport_SOURCES = \ gnunet-service-transport.c gnunet-service-transport.h \ + gnunet-service-transport_ats.h gnunet-service-transport_ats.c \ gnunet-service-transport_blacklist.h gnunet-service-transport_blacklist.c \ gnunet-service-transport_clients.h gnunet-service-transport_clients.c \ gnunet-service-transport_hello.h gnunet-service-transport_hello.c \ @@ -258,7 +256,7 @@ gnunet_service_transport_SOURCES = \ # a crash on unloading of a plugin unless the service links against # that library as well. gnunet_service_transport_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ @@ -267,8 +265,6 @@ gnunet_service_transport_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_GLPK) \ $(GN_LIBINTL) -gnunet_service_transport_DEPENDENCIES = \ - libgnunettransport.la gnunet_service_transport_CFLAGS = \ $(CFLAGS) # -DANALYZE @@ -282,7 +278,11 @@ plugin_LTLIBRARIES = \ $(HTTP_SERVER_PLUGIN_LA) \ $(HTTPS_SERVER_PLUGIN_LA) \ $(WLAN_PLUGIN_LA) \ - $(BT_PLUGIN_LA) \ + $(BT_PLUGIN_LA) + +# Note: real plugins of course need to be added +# to the plugin_LTLIBRARIES above +noinst_LTLIBRARIES = \ libgnunet_plugin_transport_template.la libgnunet_plugin_transport_tcp_la_SOURCES = \ @@ -422,6 +422,9 @@ libgnunet_plugin_transport_https_server_la_CFLAGS = \ if HAVE_TESTING check_PROGRAMS = \ + test_transport_api_restart_2peers \ + test_transport_address_switch_tcp \ + test_transport_address_switch_udp \ test_transport_testing_startstop \ test_transport_testing_restart \ test_transport_testing \ @@ -441,14 +444,11 @@ check_PROGRAMS = \ test_transport_api_bidirectional_connect \ test_transport_api_tcp \ test_transport_api_restart_1peer \ - test_transport_api_restart_2peers \ test_transport_api_timeout_tcp \ - test_transport_address_switch_tcp \ test_transport_api_limited_sockets_tcp \ test_transport_api_tcp_nat \ test_transport_api_udp \ test_transport_api_timeout_udp \ - test_transport_address_switch_udp \ $(UNIX_PLUGIN_TEST) \ $(UNIX_PLUGIN_TIMEOUT_TEST) \ $(UNIX_API_ABSTRACT_TEST) \ @@ -494,6 +494,10 @@ check_PROGRAMS = \ $(HTTPS_QUOTA_TEST) \ $(WLAN_QUOTA_TEST) \ $(BT_QUOTA_TEST) +if HAVE_GETOPT_BINARY +check_PROGRAMS += \ +test_transport_api_slow_ats +endif endif if ENABLE_TEST_RUN @@ -514,27 +518,16 @@ TESTS = \ test_transport_api_tcp \ test_transport_api_restart_1peer \ test_transport_api_restart_2peers \ - test_transport_api_timeout_tcp \ test_transport_api_limited_sockets_tcp \ test_transport_api_tcp_nat \ - test_transport_address_switch_tcp \ test_transport_api_udp \ - test_transport_api_timeout_udp \ - test_transport_address_switch_udp \ $(UNIX_PLUGIN_TEST) \ - $(UNIX_PLUGIN_TIMEOUT_TEST) \ $(UNIX_API_ABSTRACT_TEST) \ test_transport_api_udp_nat \ $(HTTP_API_TEST) \ - $(HTTP_API_TIMEOUT_TEST) \ - $(HTTP_SWITCH) \ $(HTTPS_API_TEST) \ - $(HTTPS_API_TIMEOUT_TEST) \ - $(HTTPS_SWITCH) \ $(WLAN_API_TEST) \ - $(WLAN_TIMEOUT_TEST) \ $(BT_API_TEST) \ - $(BT_TIMEOUT_TEST) \ test_transport_api_multi \ test_transport_api_monitor_peers \ test_transport_api_monitor_validation \ @@ -562,514 +555,533 @@ TESTS = \ test_quota_compliance_udp \ $(UNIX_QUOTA_TEST) \ $(HTTP_QUOTA_TEST) \ - $(HTTPS_QUOTA_TEST) + $(HTTPS_QUOTA_TEST) \ + test_transport_api_timeout_tcp \ + test_transport_api_timeout_udp \ + $(UNIX_PLUGIN_TIMEOUT_TEST) \ + $(HTTP_API_TIMEOUT_TEST) \ + $(HTTPS_API_TIMEOUT_TEST) \ + $(WLAN_TIMEOUT_TEST) \ + $(BT_TIMEOUT_TEST) \ + test_transport_address_switch_tcp \ + test_transport_address_switch_udp \ + $(HTTP_SWITCH) \ + $(HTTPS_SWITCH) +if HAVE_GETOPT_BINARY +TESTS += \ +test_transport_api_slow_ats +endif endif test_transport_testing_startstop_SOURCES = \ test_transport_testing_startstop.c test_transport_testing_startstop_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_testing_restart_SOURCES = \ test_transport_testing_restart.c test_transport_testing_restart_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_testing_SOURCES = \ test_transport_testing.c test_transport_testing_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_api_blacklisting_SOURCES = \ test_transport_api_blacklisting.c test_transport_api_blacklisting_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_blacklisting_no_bl_SOURCES = \ test_transport_blacklisting.c test_transport_blacklisting_no_bl_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_blacklisting_outbound_bl_full_SOURCES = \ test_transport_blacklisting.c test_transport_blacklisting_outbound_bl_full_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_blacklisting_outbound_bl_plugin_SOURCES = \ test_transport_blacklisting.c test_transport_blacklisting_outbound_bl_plugin_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_blacklisting_inbound_bl_full_SOURCES = \ test_transport_blacklisting.c test_transport_blacklisting_inbound_bl_full_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_blacklisting_inbound_bl_plugin_SOURCES = \ test_transport_blacklisting.c test_transport_blacklisting_inbound_bl_plugin_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_blacklisting_multiple_plugins_SOURCES = \ test_transport_blacklisting.c test_transport_blacklisting_multiple_plugins_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_api_disconnect_tcp_SOURCES = \ test_transport_api_disconnect.c test_transport_api_disconnect_tcp_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_startonly_SOURCES = \ test_transport_startonly.c test_transport_startonly_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_plugin_tcp_SOURCES = \ test_plugin_transport.c test_plugin_tcp_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_plugin_udp_SOURCES = \ test_plugin_transport.c test_plugin_udp_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_plugin_unix_SOURCES = \ test_plugin_transport.c test_plugin_unix_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_plugin_wlan_SOURCES = \ test_plugin_transport.c test_plugin_wlan_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_plugin_bluetooth_SOURCES = \ test_plugin_transport.c test_plugin_bluetooth_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_http_common_SOURCES = \ test_http_common.c plugin_transport_http_common.c test_http_common_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_plugin_http_server_SOURCES = \ test_plugin_transport.c test_plugin_http_server_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_plugin_https_server_SOURCES = \ test_plugin_transport.c test_plugin_https_server_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_plugin_http_client_SOURCES = \ test_plugin_transport.c test_plugin_http_client_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_plugin_https_client_SOURCES = \ test_plugin_transport.c test_plugin_https_client_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_api_tcp_SOURCES = \ test_transport_api.c test_transport_api_tcp_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_api_bidirectional_connect_SOURCES = \ test_transport_api_bidirectional_connect.c test_transport_api_bidirectional_connect_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_api_restart_1peer_SOURCES = \ test_transport_api_restart_1peer.c test_transport_api_restart_1peer_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_api_restart_2peers_SOURCES = \ test_transport_api_restart_2peers.c test_transport_api_restart_2peers_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_api_limited_sockets_tcp_SOURCES = \ test_transport_api_limited_sockets.c test_transport_api_limited_sockets_tcp_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_api_tcp_nat_SOURCES = \ test_transport_api.c test_transport_api_tcp_nat_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_api_manipulation_send_tcp_SOURCES = \ test_transport_api_manipulation_send_tcp.c test_transport_api_manipulation_send_tcp_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_api_manipulation_recv_tcp_SOURCES = \ test_transport_api_manipulation_recv_tcp.c test_transport_api_manipulation_recv_tcp_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_api_manipulation_cfg_SOURCES = \ test_transport_api_manipulation_cfg.c test_transport_api_manipulation_cfg_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_api_reliability_tcp_SOURCES = \ test_transport_api_reliability.c test_transport_api_reliability_tcp_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_api_timeout_tcp_SOURCES = \ test_transport_api_timeout.c test_transport_api_timeout_tcp_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_api_timeout_unix_SOURCES = \ test_transport_api_timeout.c test_transport_api_timeout_unix_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_api_timeout_wlan_SOURCES = \ test_transport_api_timeout.c test_transport_api_timeout_wlan_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_api_timeout_bluetooth_SOURCES = \ test_transport_api_timeout.c test_transport_api_timeout_bluetooth_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_api_reliability_tcp_nat_SOURCES = \ test_transport_api_reliability.c test_transport_api_reliability_tcp_nat_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_api_reliability_bluetooth_SOURCES = \ test_transport_api_reliability.c test_transport_api_reliability_bluetooth_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_api_reliability_wlan_SOURCES = \ test_transport_api_reliability.c test_transport_api_reliability_wlan_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_api_udp_SOURCES = \ test_transport_api.c test_transport_api_udp_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_api_timeout_udp_SOURCES = \ test_transport_api_timeout.c test_transport_api_timeout_udp_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_api_udp_nat_SOURCES = \ test_transport_api.c test_transport_api_udp_nat_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_api_unix_SOURCES = \ test_transport_api.c test_transport_api_unix_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_api_unix_abstract_SOURCES = \ test_transport_api.c test_transport_api_unix_abstract_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la # HTTP tests test_transport_api_http_SOURCES = \ test_transport_api.c test_transport_api_http_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_api_http_reverse_SOURCES = \ test_transport_api.c test_transport_api_http_reverse_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_api_timeout_http_SOURCES = \ test_transport_api_timeout.c test_transport_api_timeout_http_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_api_reliability_http_SOURCES = \ test_transport_api_reliability.c test_transport_api_reliability_http_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_api_reliability_http_xhr_SOURCES = \ test_transport_api_reliability.c test_transport_api_reliability_http_xhr_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_quota_compliance_http_SOURCES = \ test_quota_compliance.c test_quota_compliance_http_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ + $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_quota_compliance_http_asymmetric_SOURCES = \ test_quota_compliance.c test_quota_compliance_http_asymmetric_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ + $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_quota_compliance_https_SOURCES = \ test_quota_compliance.c test_quota_compliance_https_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ + $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_quota_compliance_https_asymmetric_SOURCES = \ test_quota_compliance.c test_quota_compliance_https_asymmetric_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ + $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la # HTTPS tests test_transport_api_https_SOURCES = \ test_transport_api.c test_transport_api_https_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_api_timeout_https_SOURCES = \ test_transport_api_timeout.c test_transport_api_timeout_https_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_api_reliability_https_SOURCES = \ test_transport_api_reliability.c test_transport_api_reliability_https_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_api_reliability_https_xhr_SOURCES = \ test_transport_api_reliability.c test_transport_api_reliability_https_xhr_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_api_reliability_unix_SOURCES = \ test_transport_api_reliability.c test_transport_api_reliability_unix_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_api_reliability_udp_SOURCES = \ test_transport_api_reliability.c test_transport_api_reliability_udp_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la if LINUX test_transport_api_wlan_SOURCES = \ test_transport_api.c test_transport_api_wlan_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la endif if LINUX @@ -1077,151 +1089,169 @@ if HAVE_LIBBLUETOOTH test_transport_api_bluetooth_SOURCES = \ test_transport_api.c test_transport_api_bluetooth_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la endif endif test_transport_address_switch_tcp_SOURCES = \ test_transport_address_switch.c test_transport_address_switch_tcp_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_address_switch_udp_SOURCES = \ test_transport_address_switch.c test_transport_address_switch_udp_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_address_switch_http_SOURCES = \ test_transport_address_switch.c test_transport_address_switch_http_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_address_switch_https_SOURCES = \ test_transport_address_switch.c test_transport_address_switch_https_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_quota_compliance_tcp_SOURCES = \ test_quota_compliance.c test_quota_compliance_tcp_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ + $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_quota_compliance_tcp_asymmetric_SOURCES = \ test_quota_compliance.c test_quota_compliance_tcp_asymmetric_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ + $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_quota_compliance_udp_SOURCES = \ test_quota_compliance.c test_quota_compliance_udp_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ + $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_quota_compliance_unix_SOURCES = \ test_quota_compliance.c test_quota_compliance_unix_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ + $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_quota_compliance_unix_asymmetric_SOURCES = \ test_quota_compliance.c test_quota_compliance_unix_asymmetric_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ + $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_quota_compliance_wlan_SOURCES = \ test_quota_compliance.c test_quota_compliance_wlan_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ + $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_quota_compliance_wlan_asymmetric_SOURCES = \ test_quota_compliance.c test_quota_compliance_wlan_asymmetric_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ + $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_quota_compliance_bluetooth_SOURCES = \ test_quota_compliance.c test_quota_compliance_bluetooth_LDADD = \ $(top_builddir)/src/nat/libgnunetnat.la \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ + $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_quota_compliance_bluetooth_asymmetric_SOURCES = \ test_quota_compliance.c test_quota_compliance_bluetooth_asymmetric_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ + $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_api_multi_SOURCES = \ test_transport_api.c test_transport_api_multi_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_api_monitor_peers_SOURCES = \ test_transport_api_monitor_peers.c test_transport_api_monitor_peers_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la test_transport_api_monitor_validation_SOURCES = \ test_transport_api_monitor_validation.c test_transport_api_monitor_validation_LDADD = \ - $(top_builddir)/src/transport/libgnunettransport.la \ + libgnunettransport.la \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/transport/libgnunettransporttesting.la + libgnunettransporttesting.la + +test_transport_api_slow_ats_SOURCES = \ + test_transport_api.c +test_transport_api_slow_ats_LDADD = \ + libgnunettransport.la \ + $(top_builddir)/src/hello/libgnunethello.la \ + $(top_builddir)/src/util/libgnunetutil.la \ + libgnunettransporttesting.la EXTRA_DIST = \ test_plugin_hostkey \ test_plugin_hostkey.ecc \ +test_delay \ template_cfg_peer1.conf\ template_cfg_peer2.conf\ test_plugin_transport_data.conf\ @@ -1306,20 +1336,18 @@ test_transport_api_timeout_bluetooth_peer1.conf\ test_transport_api_timeout_bluetooth_peer2.conf\ test_transport_api_reliability_udp_peer1.conf\ test_transport_api_reliability_udp_peer2.conf\ +test_transport_api_reliability_http_xhr_peer1.conf\ +test_transport_api_reliability_http_xhr_peer2.conf\ +test_transport_api_reliability_https_xhr_peer1.conf\ +test_transport_api_reliability_https_xhr_peer2.conf\ test_transport_api_reliability_unix_peer1.conf\ test_transport_api_reliability_unix_peer2.conf\ test_transport_api_reliability_wlan_peer1.conf\ test_transport_api_reliability_wlan_peer2.conf\ +test_transport_api_unreliability_wlan_peer1.conf\ +test_transport_api_unreliability_wlan_peer2.conf\ test_transport_api_reliability_bluetooth_peer1.conf\ test_transport_api_reliability_bluetooth_peer2.conf\ -test_transport_test_transport_address_switch_http_peer1.conf\ -test_transport_test_transport_address_switch_http_peer2.conf\ -test_transport_test_transport_address_switch_https_peer1.conf\ -test_transport_test_transport_address_switch_https_peer2.conf\ -test_transport_test_transport_address_switch_udp_peer1.conf\ -test_transport_test_transport_address_switch_udp_peer2.conf\ -test_transport_test_transport_address_switch_tcp_peer1.conf\ -test_transport_test_transport_address_switch_tcp_peer2.conf\ test_transport_api_wlan_peer1.conf\ test_transport_api_wlan_peer2.conf\ test_transport_api_bluetooth_peer1.conf\ @@ -1347,5 +1375,6 @@ test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf \ test_transport_api_http_reverse_peer1.conf \ test_transport_api_http_reverse_peer2.conf \ perf_tcp_peer1.conf \ -perf_tcp_peer2.conf - +perf_tcp_peer2.conf \ +test_transport_api_slow_ats_peer1.conf \ +test_transport_api_slow_ats_peer2.conf