X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fats%2FMakefile.am;h=4f2a93227327531c107fb75b84e29307331c843b;hb=404c9065789248a5eba44fb4bc320bfeaa988da6;hp=fd215621320af1e4d4ac69e89ef5cee048b15a8b;hpb=045bc5be4f794b863b334a41c126c222c5af6c3c;p=oweals%2Fgnunet.git diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am index fd2156213..4f2a93227 100644 --- a/src/ats/Makefile.am +++ b/src/ats/Makefile.am @@ -1,3 +1,4 @@ +# This Makefile.am is in the public domain AM_CPPFLAGS = -I$(top_srcdir)/src/include plugindir = $(libdir)/gnunet @@ -10,547 +11,208 @@ pkgcfg_DATA = \ ats.conf if MINGW - WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols + WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols endif if USE_COVERAGE AM_CFLAGS = -fprofile-arcs -ftest-coverage endif -if HAVE_LIBGLPK - GN_LIBGLPK = -lglpk - GN_MLP_LIB = libgnunet_plugin_ats_mlp.la - GN_MLP_TEST = test_ats_mlp - GN_MLP_TEST_UPDATE = test_ats_mlp_update - GN_MLP_TEST_AVG = test_ats_mlp_averaging - GN_MLP_PERF = perf_ats_mlp - GN_MLP_ADD_ADDRESS = test_ats_solver_add_address_mlp - GN_MLP_ADD_REQUEST_ADDRESS = test_ats_solver_add_address_and_request_mlp - GN_MLP_REQUEST_ADD_ADDRESS = test_ats_solver_request_and_add_address_mlp - GN_MLP_REQUEST_DELETE_ADDRESS = test_ats_solver_request_and_delete_address_mlp - GN_MLP_ALTERNATIVE_DELETE_ADDRESS = test_ats_solver_alternative_after_delete_address_mlp -endif - -lib_LTLIBRARIES = libgnunetats.la +lib_LTLIBRARIES = \ + libgnunetats.la \ + libgnunetatsapplication.la \ + libgnunetatstransport.la plugin_LTLIBRARIES = \ libgnunet_plugin_ats_proportional.la \ - $(GN_MLP_LIB) + libgnunet_plugin_ats2_simple.la + +if HAVE_EXPERIMENTAL +plugin_LTLIBRARIES += \ + libgnunet_plugin_ats_ril.la +if HAVE_LIBGLPK +plugin_LTLIBRARIES += \ + libgnunet_plugin_ats_mlp.la +endif +endif libgnunetats_la_SOURCES = \ + ats_api_connectivity.c \ ats_api_scheduling.c \ - ats_api_performance.c - + ats_api_scanner.c \ + ats_api_performance.c libgnunetats_la_LIBADD = \ + $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/util/libgnunetutil.la \ $(LTLIBINTL) - libgnunetats_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) \ + $(GN_LIB_LDFLAGS) $(WINFLAGS) \ -version-info 4:0:0 -libexec_PROGRAMS = \ - gnunet-service-ats +libgnunetatsapplication_la_SOURCES = \ + ats_api2_application.c +libgnunetatsapplication_la_LIBADD = \ + $(top_builddir)/src/util/libgnunetutil.la \ + $(LTLIBINTL) +libgnunetatsapplication_la_LDFLAGS = \ + $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + -version-info 0:0:0 -# gnunet-service-ats-solver_proportional.c gnunet-service-ats-solver_proportional.h -# $(GN_MLP_SRC) -# gnunet-service-ats-solver_ril.c gnunet-service-ats-solver_ril.h +libgnunetatstransport_la_SOURCES = \ + ats_api2_transport.c +libgnunetatstransport_la_LIBADD = \ + $(top_builddir)/src/util/libgnunetutil.la \ + $(LTLIBINTL) +libgnunetatstransport_la_LDFLAGS = \ + $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + -version-info 0:0:0 -gnunet_service_ats_SOURCES = \ - gnunet-service-ats.c gnunet-service-ats.h\ - gnunet-service-ats_addresses.c gnunet-service-ats_addresses.h \ - gnunet-service-ats_normalization.c gnunet-service-ats_normalization.h \ - gnunet-service-ats_performance.c gnunet-service-ats_performance.h \ - gnunet-service-ats_scheduling.c gnunet-service-ats_scheduling.h \ - gnunet-service-ats_reservations.c gnunet-service-ats_reservations.h -gnunet_service_ats_LDADD = \ +libgnunet_plugin_ats_proportional_la_SOURCES = \ + plugin_ats_proportional.c +libgnunet_plugin_ats_proportional_la_LIBADD = \ + libgnunetats.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la \ - libgnunetats.la \ - $(GN_LIBINTL) -gnunet_service_ats_DEPENDENCIES = \ - libgnunetats.la - -if HAVE_TESTING -TESTING_TESTS = \ - test_ats_api_scheduling_init \ - test_ats_api_scheduling_add_address \ - test_ats_api_scheduling_add_address_duplicate \ - test_ats_api_scheduling_add_address_inbound \ - test_ats_api_scheduling_destroy_address \ - test_ats_api_scheduling_destroy_address_twice \ - test_ats_api_scheduling_add_session \ - test_ats_api_scheduling_destroy_session \ - test_ats_api_performance_list_all_addresses \ - test_ats_api_performance_list_peer_addresses \ - test_ats_api_performance_list_all_addresses_active \ - test_ats_api_performance_monitor \ - test_ats_api_performance_monitor_initial_callback \ - test_ats_solver_add_address_proportional \ - test_ats_solver_add_address_and_request_proportional \ - test_ats_solver_request_and_add_address_proportional \ - test_ats_solver_request_and_delete_address_proportional \ - test_ats_solver_alternative_after_delete_address_proportional \ - $(GN_MLP_ADD_REQUEST_ADDRESS) \ - $(GN_MLP_ADD_REQUEST_ADDRESS) \ - $(GN_MLP_REQUEST_ADD_ADDRESS) \ - $(GN_MLP_REQUEST_DELETE_ADDRESS) \ - $(GN_MLP_ALTERNATIVE_DELETE_ADDRESS) -# test_ats_solver_add_address_ril -# test_ats_solver_add_address_and_request_ril -# test_ats_solver_request_and_add_address_ril -# test_ats_solver_request_and_delete_address_ril -# test_ats_solver_alternative_after_delete_address_ril - -# test_ats_api_scheduling_min_bw -# test_ats_api_scheduling_check_min_bw_alt -# test_ats_api_scheduling_update_address -# test_ats_api_scheduling_destroy_inbound_connection -# test_ats_api_scheduling_block_and_reset -# test_ats_normalization_update_quality -# test_ats_change_preference -# test_ats_simplistic -# test_ats_simplistic_switch_networks -# test_ats_simplistic_change_preference -# test_ats_api_performance_address_info -# test_ats_api_performance_feedback -endif - -check_PROGRAMS = \ - $(TESTING_TESTS) -# $(GN_MLP_TEST) $(GN_MLP_PERF) $(GN_MLP_TEST_UPDATE) -# $(GN_MLP_TEST_AVG) - -if ENABLE_TEST_RUN -TESTS = $(check_PROGRAMS) -endif + $(LTLIBINTL) +libgnunet_plugin_ats_proportional_la_LDFLAGS = \ + $(GN_PLUGIN_LDFLAGS) -libgnunet_plugin_ats_proportional_la_SOURCES = \ - libgnunet_plugin_ats_proportional.c -libgnunet_plugin_ats_proportional_la_LIBADD = \ +libgnunet_plugin_ats2_simple_la_SOURCES = \ + plugin_ats2_simple.c +libgnunet_plugin_ats2_simple_la_LIBADD = \ + $(top_builddir)/src/hello/libgnunethello.la \ + $(top_builddir)/src/peerstore/libgnunetpeerstore.la \ + $(top_builddir)/src/nt/libgnunetnt.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la \ $(LTLIBINTL) +libgnunet_plugin_ats2_simple_la_LDFLAGS = \ + $(GN_PLUGIN_LDFLAGS) + -if HAVE_LIBGLPK libgnunet_plugin_ats_mlp_la_SOURCES = \ - libgnunet_plugin_ats_mlp.c + plugin_ats_mlp.c libgnunet_plugin_ats_mlp_la_LIBADD = \ + libgnunetats.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ - $(top_builddir)/src/util/libgnunetutil.la \ - $(GN_LIBGLPK) + $(top_builddir)/src/util/libgnunetutil.la libgnunet_plugin_ats_mlp_la_LDFLAGS = \ - $(GN_LIBGLPK) -endif - -# scheduling API tests - -test_ats_api_scheduling_init_SOURCES = \ - test_ats_api_scheduling_init.c \ - test_ats_api_common.c test_ats_api_common.h -test_ats_api_scheduling_init_LDADD = \ - $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/ats/libgnunetats.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la + $(GN_PLUGIN_LDFLAGS) \ + -lglpk -test_ats_api_scheduling_add_address_SOURCES = \ - test_ats_api_scheduling_add_address.c \ - test_ats_api_common.c test_ats_api_common.h -test_ats_api_scheduling_add_address_LDADD = \ - $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/ats/libgnunetats.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la - -test_ats_api_scheduling_add_address_inbound_SOURCES = \ - test_ats_api_scheduling_add_address_inbound.c \ - test_ats_api_common.c test_ats_api_common.h -test_ats_api_scheduling_add_address_inbound_LDADD = \ +libgnunet_plugin_ats_ril_la_SOURCES = \ + plugin_ats_ril.c +libgnunet_plugin_ats_ril_la_LIBADD = \ + libgnunetats.la \ + $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/ats/libgnunetats.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la + $(LTLIBINTL) +libgnunet_plugin_ats_ril_la_LDFLAGS = \ + $(GN_PLUGIN_LDFLAGS) -test_ats_api_scheduling_add_address_duplicate_SOURCES = \ - test_ats_api_scheduling_add_address_duplicate.c \ - test_ats_api_common.c test_ats_api_common.h -test_ats_api_scheduling_add_address_duplicate_LDADD = \ - $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/ats/libgnunetats.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la +libexec_PROGRAMS = \ + gnunet-service-ats \ + gnunet-service-ats-new -test_ats_api_scheduling_destroy_address_SOURCES = \ - test_ats_api_scheduling_destroy_address.c \ - test_ats_api_common.c test_ats_api_common.h -test_ats_api_scheduling_destroy_address_LDADD = \ +gnunet_service_ats_SOURCES = \ + gnunet-service-ats.c gnunet-service-ats.h \ + gnunet-service-ats_addresses.c gnunet-service-ats_addresses.h \ + gnunet-service-ats_connectivity.c gnunet-service-ats_connectivity.h \ + gnunet-service-ats_normalization.c gnunet-service-ats_normalization.h \ + gnunet-service-ats_performance.c gnunet-service-ats_performance.h \ + gnunet-service-ats_plugins.c gnunet-service-ats_plugins.h \ + gnunet-service-ats_preferences.c gnunet-service-ats_preferences.h \ + gnunet-service-ats_scheduling.c gnunet-service-ats_scheduling.h \ + gnunet-service-ats_reservations.c gnunet-service-ats_reservations.h +gnunet_service_ats_LDADD = \ + $(top_builddir)/src/nt/libgnunetnt.la \ + $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/ats/libgnunetats.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la + libgnunetats.la \ + $(GN_LIBINTL) -test_ats_api_scheduling_destroy_address_twice_SOURCES = \ - test_ats_api_scheduling_destroy_address_twice.c \ - test_ats_api_common.c test_ats_api_common.h -test_ats_api_scheduling_destroy_address_twice_LDADD = \ +gnunet_service_ats_new_SOURCES = \ + gnunet-service-ats-new.c +gnunet_service_ats_new_LDADD = \ + $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/ats/libgnunetats.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la + $(GN_LIBINTL) -test_ats_api_scheduling_add_session_SOURCES = \ - test_ats_api_scheduling_add_session.c test_ats_api_common.c -test_ats_api_scheduling_add_session_LDADD = \ - $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/ats/libgnunetats.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la -test_ats_api_scheduling_destroy_session_SOURCES = \ - test_ats_api_scheduling_destroy_session.c test_ats_api_common.c -test_ats_api_scheduling_destroy_session_LDADD = \ - $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/ats/libgnunetats.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la +if HAVE_TESTING +TESTING_TESTS = \ + test_ats_api_proportional \ + test_ats_reservation_api_proportional \ + test_ats2_lib +if HAVE_EXPERIMENTAL +TESTING_TESTS += \ + test_ats_api_ril +if HAVE_LIBGLPK +TESTING_TESTS += \ + test_ats_api_mlp +endif +endif +endif -# performance API tests +check_PROGRAMS = \ + $(TESTING_TESTS) -test_ats_api_performance_list_all_addresses_SOURCES = \ - test_ats_api_performance_list_all_addresses.c -test_ats_api_performance_list_all_addresses_LDADD = \ - $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/hello/libgnunethello.la \ - $(top_builddir)/src/ats/libgnunetats.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la +if ENABLE_TEST_RUN +AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; +TESTS = $(check_PROGRAMS) +endif -test_ats_api_performance_list_peer_addresses_SOURCES = \ - test_ats_api_performance_list_peer_addresses.c -test_ats_api_performance_list_peer_addresses_LDADD = \ +test_ats_api_proportional_SOURCES = \ + test_ats_api.c \ + test_ats_lib.c test_ats_lib.h +test_ats_api_proportional_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ $(top_builddir)/src/hello/libgnunethello.la \ - $(top_builddir)/src/ats/libgnunetats.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la - -test_ats_api_performance_list_all_addresses_active_SOURCES = \ - test_ats_api_performance_list_all_addresses_active.c -test_ats_api_performance_list_all_addresses_active_LDADD = \ - $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/hello/libgnunethello.la \ - $(top_builddir)/src/ats/libgnunetats.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la + libgnunetats.la -test_ats_api_performance_monitor_SOURCES = \ - test_ats_api_performance_monitor.c -test_ats_api_performance_monitor_LDADD = \ - $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/hello/libgnunethello.la \ - $(top_builddir)/src/ats/libgnunetats.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la - -test_ats_api_performance_monitor_initial_callback_SOURCES = \ - test_ats_api_performance_monitor_initial_callback.c -test_ats_api_performance_monitor_initial_callback_LDADD = \ - $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/hello/libgnunethello.la \ - $(top_builddir)/src/ats/libgnunetats.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la - -# solver tests -test_ats_solver_add_address_proportional_SOURCES = \ - test_ats_solver_add_address.c \ - test_ats_api_common.c test_ats_api_common.h -test_ats_solver_add_address_proportional_LDADD = \ - $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/hello/libgnunethello.la \ - $(top_builddir)/src/ats/libgnunetats.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la - -if HAVE_LIBGLPK -test_ats_solver_add_address_mlp_SOURCES = \ - test_ats_solver_add_address.c \ - test_ats_api_common.c test_ats_api_common.h -test_ats_solver_add_address_mlp_LDADD = \ - $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/hello/libgnunethello.la \ - $(top_builddir)/src/ats/libgnunetats.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la -endif - -test_ats_solver_add_address_ril_SOURCES = \ - test_ats_solver_add_address.c \ - test_ats_api_common.c test_ats_api_common.h -test_ats_solver_add_address_ril_LDADD = \ +test_ats_reservation_api_proportional_SOURCES = \ + test_ats_reservation_api.c \ + test_ats_lib.c test_ats_lib.h +test_ats_reservation_api_proportional_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ $(top_builddir)/src/hello/libgnunethello.la \ - $(top_builddir)/src/ats/libgnunetats.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la - -test_ats_solver_add_address_and_request_proportional_SOURCES = \ - test_ats_solver_add_address_and_request.c \ - test_ats_api_common.c test_ats_api_common.h -test_ats_solver_add_address_and_request_proportional_LDADD = \ - $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/hello/libgnunethello.la \ - $(top_builddir)/src/ats/libgnunetats.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la - -if HAVE_LIBGLPK -test_ats_solver_add_address_and_request_mlp_SOURCES = \ - test_ats_solver_add_address_and_request.c \ - test_ats_api_common.c test_ats_api_common.h -test_ats_solver_add_address_and_request_mlp_LDADD = \ + libgnunetats.la + +test_ats_api_ril_SOURCES = \ + test_ats_api.c \ + test_ats_lib.c test_ats_lib.h +test_ats_api_ril_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ $(top_builddir)/src/hello/libgnunethello.la \ - $(top_builddir)/src/ats/libgnunetats.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la -endif - -test_ats_solver_add_address_and_request_ril_SOURCES = \ - test_ats_solver_add_address_and_request.c \ - test_ats_api_common.c test_ats_api_common.h -test_ats_solver_add_address_and_request_ril_LDADD = \ - $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/hello/libgnunethello.la \ - $(top_builddir)/src/ats/libgnunetats.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la - + libgnunetats.la -test_ats_solver_request_and_add_address_proportional_SOURCES = \ - test_ats_solver_request_and_add_address.c \ - test_ats_api_common.c test_ats_api_common.h -test_ats_solver_request_and_add_address_proportional_LDADD = \ +test_ats_api_mlp_SOURCES = \ + test_ats_api.c \ + test_ats_lib.c test_ats_lib.h +test_ats_api_mlp_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ $(top_builddir)/src/hello/libgnunethello.la \ - $(top_builddir)/src/ats/libgnunetats.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la - -if HAVE_LIBGLPK -test_ats_solver_request_and_add_address_mlp_SOURCES = \ - test_ats_solver_request_and_add_address.c \ - test_ats_api_common.c test_ats_api_common.h -test_ats_solver_request_and_add_address_mlp_LDADD = \ - $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/hello/libgnunethello.la \ - $(top_builddir)/src/ats/libgnunetats.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la -endif - -test_ats_solver_request_and_add_address_ril_SOURCES = \ - test_ats_solver_request_and_add_address.c \ - test_ats_api_common.c test_ats_api_common.h -test_ats_solver_request_and_add_address_ril_LDADD = \ - $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/hello/libgnunethello.la \ - $(top_builddir)/src/ats/libgnunetats.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la - + libgnunetats.la -test_ats_solver_request_and_delete_address_proportional_SOURCES = \ - test_ats_solver_request_and_delete_address.c \ - test_ats_api_common.c test_ats_api_common.h -test_ats_solver_request_and_delete_address_proportional_LDADD = \ +test_ats2_lib_SOURCES = \ + test_ats2_lib.c test_ats2_lib.h +test_ats2_lib_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ $(top_builddir)/src/hello/libgnunethello.la \ - $(top_builddir)/src/ats/libgnunetats.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la - -if HAVE_LIBGLPK -test_ats_solver_request_and_delete_address_mlp_SOURCES = \ - test_ats_solver_request_and_delete_address.c \ - test_ats_api_common.c test_ats_api_common.h -test_ats_solver_request_and_delete_address_mlp_LDADD = \ - $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/hello/libgnunethello.la \ - $(top_builddir)/src/ats/libgnunetats.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la -endif - -test_ats_solver_request_and_delete_address_ril_SOURCES = \ - test_ats_solver_request_and_delete_address.c \ - test_ats_api_common.c test_ats_api_common.h -test_ats_solver_request_and_delete_address_ril_LDADD = \ - $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/hello/libgnunethello.la \ - $(top_builddir)/src/ats/libgnunetats.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la + libgnunetatsapplication.la \ + libgnunetatstransport.la -test_ats_solver_alternative_after_delete_address_proportional_SOURCES = \ - test_ats_solver_alternative_after_delete_address.c \ - test_ats_api_common.c test_ats_api_common.h -test_ats_solver_alternative_after_delete_address_proportional_LDADD = \ - $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/hello/libgnunethello.la \ - $(top_builddir)/src/ats/libgnunetats.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la - -if HAVE_LIBGLPK -test_ats_solver_alternative_after_delete_address_mlp_SOURCES = \ - test_ats_solver_alternative_after_delete_address.c \ - test_ats_api_common.c test_ats_api_common.h -test_ats_solver_alternative_after_delete_address_mlp_LDADD = \ - $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/hello/libgnunethello.la \ - $(top_builddir)/src/ats/libgnunetats.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la -endif - -test_ats_solver_alternative_after_delete_address_ril_SOURCES = \ - test_ats_solver_alternative_after_delete_address.c \ - test_ats_api_common.c test_ats_api_common.h -test_ats_solver_alternative_after_delete_address_ril_LDADD = \ - $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/hello/libgnunethello.la \ - $(top_builddir)/src/ats/libgnunetats.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la - - -#test_ats_api_scheduling_min_bw_SOURCES = \ -# test_ats_api_scheduling_min_bw.c test_ats_api_common.c -#test_ats_api_scheduling_min_bw_LDADD = \ -# $(top_builddir)/src/util/libgnunetutil.la \ -# $(top_builddir)/src/testing/libgnunettesting.la \ -# $(top_builddir)/src/ats/libgnunetats.la -# -#test_ats_api_scheduling_check_min_bw_alt_SOURCES = \ -# test_ats_api_scheduling_check_min_bw_alt.c test_ats_api_common.c -#test_ats_api_scheduling_check_min_bw_alt_LDADD = \ -# $(top_builddir)/src/util/libgnunetutil.la \ -# $(top_builddir)/src/testing/libgnunettesting.la \ -# $(top_builddir)/src/ats/libgnunetats.la - - -#test_ats_api_scheduling_update_address_SOURCES = \ -# test_ats_api_scheduling_update_address.c test_ats_api_common.c -#test_ats_api_scheduling_update_address_LDADD = \ -# $(top_builddir)/src/util/libgnunetutil.la \ -# $(top_builddir)/src/testing/libgnunettesting.la \ -# $(top_builddir)/src/ats/libgnunetats.la - -#test_ats_api_scheduling_destroy_inbound_connection_SOURCES = \ -# test_ats_api_scheduling_destroy_inbound_connection.c test_ats_api_common.c -#test_ats_api_scheduling_destroy_inbound_connection_LDADD = \ -# $(top_builddir)/src/util/libgnunetutil.la \ -# $(top_builddir)/src/testing/libgnunettesting.la \ -# $(top_builddir)/src/ats/libgnunetats.la - -#test_ats_api_scheduling_block_and_reset_SOURCES = \ -# test_ats_api_scheduling_block_and_reset.c test_ats_api_common.c -#test_ats_api_scheduling_block_and_reset_LDADD = \ -# $(top_builddir)/src/util/libgnunetutil.la \ -# $(top_builddir)/src/testing/libgnunettesting.la \ -# $(top_builddir)/src/ats/libgnunetats.la - -#test_ats_api_performance_feedback_SOURCES = \ -# test_ats_api_performance_feedback.c -#test_ats_api_performance_feedback_LDADD = \ -# $(top_builddir)/src/util/libgnunetutil.la \ -# $(top_builddir)/src/testing/libgnunettesting.la \ -# $(top_builddir)/src/hello/libgnunethello.la \ -# $(top_builddir)/src/ats/libgnunetats.la - - - -#test_ats_api_performance_address_info_SOURCES = \ -# test_ats_api_performance_address_info.c -#test_ats_api_performance_address_info_LDADD = \ -# $(top_builddir)/src/util/libgnunetutil.la \ -# $(top_builddir)/src/testing/libgnunettesting.la \ -# $(top_builddir)/src/hello/libgnunethello.la \ -# $(top_builddir)/src/ats/libgnunetats.la - - -#test_ats_simplistic_SOURCES = \ -# test_ats_simplistic.c test_ats_api_common.c -#test_ats_simplistic_LDADD = \ -# $(top_builddir)/src/util/libgnunetutil.la \ -# $(top_builddir)/src/testing/libgnunettesting.la \ -# $(top_builddir)/src/hello/libgnunethello.la \ -# $(top_builddir)/src/ats/libgnunetats.la - -#test_ats_simplistic_switch_networks_SOURCES = \ -# test_ats_simplistic_switch_networks.c test_ats_api_common.c -#test_ats_simplistic_switch_networks_LDADD = \ -# $(top_builddir)/src/util/libgnunetutil.la \ -# $(top_builddir)/src/testing/libgnunettesting.la \ -# $(top_builddir)/src/ats/libgnunetats.la - -#test_ats_simplistic_change_preference_SOURCES = \ -# test_ats_simplistic_change_preference.c test_ats_api_common.c -#test_ats_simplistic_change_preference_LDADD = \ -# $(top_builddir)/src/util/libgnunetutil.la \ -# $(top_builddir)/src/testing/libgnunettesting.la \ -# $(top_builddir)/src/ats/libgnunetats.la - -#test_ats_change_preference_SOURCES = \ -# test_ats_change_preference.c test_ats_api_common.c -#test_ats_change_preference_LDADD = \ -# $(top_builddir)/src/util/libgnunetutil.la \ -# $(top_builddir)/src/testing/libgnunettesting.la \ -# $(top_builddir)/src/ats/libgnunetats.la - - -#test_ats_mlp_SOURCES = \ -# $(GN_MLP_SRC) test_ats_mlp.c test_ats_api_common.c gnunet-service-ats_normalization.c -#test_ats_mlp_LDADD = \ -# $(GN_LIBGLPK) \ -# $(top_builddir)/src/util/libgnunetutil.la \ -# $(top_builddir)/src/statistics/libgnunetstatistics.la \ -# $(top_builddir)/src/ats/libgnunetats.la - -#test_ats_mlp_update_SOURCES = \ -# $(GN_MLP_SRC) test_ats_mlp_update.c test_ats_api_common.c gnunet-service-ats_normalization.c -#test_ats_mlp_update_LDADD = \ -# $(GN_LIBGLPK) \ -# $(top_builddir)/src/util/libgnunetutil.la \ -# $(top_builddir)/src/statistics/libgnunetstatistics.la \ -# $(top_builddir)/src/ats/libgnunetats.la - -#perf_ats_mlp_SOURCES = \ -# $(GN_MLP_SRC) perf_ats_mlp.c test_ats_api_common.c gnunet-service-ats_normalization.c -#perf_ats_mlp_LDADD = \ -# $(GN_LIBGLPK) \ -# $(top_builddir)/src/util/libgnunetutil.la \ -# $(top_builddir)/src/statistics/libgnunetstatistics.la \ -# $(top_builddir)/src/ats/libgnunetats.la - -#test_ats_normalization_update_quality_SOURCES = \ -# test_ats_normalization_update_quality.c test_ats_api_common.c -#test_ats_normalization_update_quality_LDADD = \ -# $(GN_LIBGLPK) \ -# $(top_builddir)/src/util/libgnunetutil.la \ -# $(top_builddir)/src/statistics/libgnunetstatistics.la \ -# $(top_builddir)/src/testing/libgnunettesting.la \ -# $(top_builddir)/src/ats/libgnunetats.la -#endif EXTRA_DIST = \ - ats.h \ - test_ats_api.conf \ - test_ats_mlp.conf \ - test_ats_solver_default.conf \ - test_ats_solver_proportional.conf \ - test_ats_solver_mlp.conf \ - test_ats_solver_ril.conf + ats.h ats2.h \ + plugin_ats2_common.c \ + test_delay \ + test_ats_api_mlp.conf \ + test_ats_api_ril.conf \ + test_ats_api_proportional.conf