-simplify logic

[oweals/gnunet.git] / src / transport / Makefile.am

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 6866ea0eec97a0324cfa9b8c781ec0944f4a2b4b..289fcd4c0fc5cdf0850bc41c2ba2601f0eb51f34 100644 (file)
--- 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
@@ -168,6 +169,7 @@ libgnunettransport_la_SOURCES = \
   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 = \
@@ -240,6 +242,7 @@ gnunet_transport_LDADD = \
 
 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 \
@@ -415,6 +418,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 \
@@ -434,14 +440,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) \
@@ -486,7 +489,8 @@ check_PROGRAMS = \
  $(HTTP_QUOTA_TEST) \
  $(HTTPS_QUOTA_TEST) \
  $(WLAN_QUOTA_TEST) \
- $(BT_QUOTA_TEST)
+ $(BT_QUOTA_TEST) \
+ test_transport_api_slow_ats
 endif
 
 if ENABLE_TEST_RUN
@@ -507,27 +511,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 \
@@ -555,7 +548,19 @@ TESTS = \
  test_quota_compliance_udp \
  $(UNIX_QUOTA_TEST) \
  $(HTTP_QUOTA_TEST) \
- $(HTTPS_QUOTA_TEST)
+ $(HTTPS_QUOTA_TEST) \
+ test_transport_api_slow_ats \
+ 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)
 endif
 
 test_transport_testing_startstop_SOURCES = \
@@ -978,6 +983,7 @@ test_quota_compliance_http_SOURCES = \
 test_quota_compliance_http_LDADD = \
  libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  libgnunettransporttesting.la
 
@@ -986,6 +992,7 @@ test_quota_compliance_http_asymmetric_SOURCES = \
 test_quota_compliance_http_asymmetric_LDADD = \
  libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  libgnunettransporttesting.la
 
@@ -994,6 +1001,7 @@ test_quota_compliance_https_SOURCES = \
 test_quota_compliance_https_LDADD = \
  libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  libgnunettransporttesting.la
 
@@ -1002,6 +1010,7 @@ test_quota_compliance_https_asymmetric_SOURCES = \
 test_quota_compliance_https_asymmetric_LDADD = \
  libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  libgnunettransporttesting.la
 
@@ -1119,6 +1128,7 @@ test_quota_compliance_tcp_SOURCES = \
 test_quota_compliance_tcp_LDADD = \
  libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  libgnunettransporttesting.la
 
@@ -1127,6 +1137,7 @@ test_quota_compliance_tcp_asymmetric_SOURCES = \
 test_quota_compliance_tcp_asymmetric_LDADD = \
  libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  libgnunettransporttesting.la
 
@@ -1135,6 +1146,7 @@ test_quota_compliance_udp_SOURCES = \
 test_quota_compliance_udp_LDADD = \
  libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  libgnunettransporttesting.la
 
@@ -1143,6 +1155,7 @@ test_quota_compliance_unix_SOURCES = \
 test_quota_compliance_unix_LDADD = \
  libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  libgnunettransporttesting.la
 
@@ -1151,6 +1164,7 @@ test_quota_compliance_unix_asymmetric_SOURCES = \
 test_quota_compliance_unix_asymmetric_LDADD = \
  libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  libgnunettransporttesting.la
 
@@ -1159,6 +1173,7 @@ test_quota_compliance_wlan_SOURCES = \
 test_quota_compliance_wlan_LDADD = \
  libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  libgnunettransporttesting.la
 
@@ -1167,6 +1182,7 @@ test_quota_compliance_wlan_asymmetric_SOURCES = \
 test_quota_compliance_wlan_asymmetric_LDADD = \
  libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  libgnunettransporttesting.la
 
@@ -1176,6 +1192,7 @@ test_quota_compliance_bluetooth_LDADD = \
  $(top_builddir)/src/nat/libgnunetnat.la \
  libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  libgnunettransporttesting.la
 
@@ -1184,6 +1201,7 @@ test_quota_compliance_bluetooth_asymmetric_SOURCES = \
 test_quota_compliance_bluetooth_asymmetric_LDADD = \
  libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  libgnunettransporttesting.la
 
@@ -1211,10 +1229,19 @@ test_transport_api_monitor_validation_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.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\
@@ -1340,5 +1367,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