X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fats-tests%2FMakefile.am;h=55fda3a47e6a40c0fd771038fedc7176e22faf9f;hb=d06a3e6becaaa64d744303e14a13974f9b7e5bc8;hp=931d3e5b5e16fc8b47c7a29e4bbe421718fec0a2;hpb=475391ffb22f9016758ae53f6e7de81c424ee215;p=oweals%2Fgnunet.git

diff --git a/src/ats-tests/Makefile.am b/src/ats-tests/Makefile.am
index 931d3e5b5..55fda3a47 100644
--- a/src/ats-tests/Makefile.am
+++ b/src/ats-tests/Makefile.am
@@ -5,7 +5,7 @@ pkgcfgdir= $(pkgdatadir)/config.d/
 libexecdir= $(pkglibdir)/libexec/
 
 if MINGW
- WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 
+ WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
 endif
 
 if USE_COVERAGE
@@ -13,105 +13,250 @@ if USE_COVERAGE
 endif
 
 if HAVE_LIBGLPK
- PERF_MLP_NONE = perf_ats_mlp_none
- PERF_MLP_BANDWIDTH = perf_ats_mlp_bandwidth
- PERF_MLP_LATENCY = perf_ats_mlp_latency
+ PERF_MLP =  perf_ats_mlp_transport_none \
+ perf_ats_mlp_core_none \
+ perf_ats_mlp_transport_bandwidth \
+ perf_ats_mlp_core_bandwidth \
+ perf_ats_mlp_transport_latency \
+ perf_ats_mlp_core_latency
 endif
 
 if HAVE_TESTING
 TESTING_TESTS = \
- perf_ats_proportional_none \
- perf_ats_proportional_bandwidth \
- perf_ats_proportional_latency \
- #perf_ats_mlp_none
- #perf_ats_mlp_bandwidth
- #perf_ats_ril_none 
- #perf_ats_ril_bandwidth
- #perf_ats_ril_latency
+ perf_ats_proportional_transport_none \
+ perf_ats_proportional_core_none \
+ perf_ats_proportional_transport_bandwidth \
+ perf_ats_proportional_core_bandwidth \
+ perf_ats_proportional_transport_latency \
+ perf_ats_proportional_core_latency \
+ $(PERF_MLP)
+# perf_ats_ril_transport_none  perf_ats_ril_core_none perf_ats_ril_transport_bandwidth perf_ats_ril_core_bandwidth perf_ats_ril_transport_latency perf_ats_ril_core_latency
 endif
 
+lib_LTLIBRARIES = \
+  libgnunetatstesting.la
+
 check_PROGRAMS = \
  $(TESTING_TESTS)
- 
+
 if ENABLE_TEST_RUN
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
 TESTS = $(check_PROGRAMS)
 endif
 
-perf_ats_proportional_none_SOURCES = \
-  perf_ats.c  
-perf_ats_proportional_none_LDADD = \
+noinst_PROGRAMS = \
+ gnunet-ats-sim gnunet-solver-eval
+
+libgnunetatstesting_la_SOURCES = \
+  ats-testing.c ats-testing.h \
+  ats-testing-log.c ats-testing-traffic.c \
+  ats-testing-experiment.c ats-testing-preferences.c
+libgnunetatstesting_la_LIBADD = \
+  $(top_builddir)/src/testbed/libgnunettestbed.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+  $(GN_LIBINTL)
+libgnunetatstesting_la_DEPENDENCIES = \
+  $(top_builddir)/src/testbed/libgnunettestbed.la \
+  $(top_builddir)/src/ats/libgnunetats.la
+libgnunetatstesting_la_LDFLAGS = \
+ $(GN_LIB_LDFLAGS)
+
+gnunet_ats_sim_SOURCES = \
+ gnunet-ats-sim.c
+gnunet_ats_sim_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/ats-tests/libgnunetatstesting.la \
+ $(top_builddir)/src/testbed/libgnunettestbed.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
+ $(top_builddir)/src/core/libgnunetcore.la \
+ $(top_builddir)/src/transport/libgnunettransport.la
+gnunet_ats_sim_DEPENDENCIES = \
+ libgnunetatstesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
+
+gnunet_solver_eval_SOURCES = \
+ gnunet-solver-eval.c
+gnunet_solver_eval_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
+ $(top_builddir)/src/core/libgnunetcore.la \
+ $(top_builddir)/src/transport/libgnunettransport.la
+gnunet_solver_eval_DEPENDENCIES = \
+ $(top_builddir)/src/util/libgnunetutil.la
+
+perf_ats_proportional_core_none_SOURCES = \
+  perf_ats.c
+perf_ats_proportional_core_none_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/ats-tests/libgnunetatstesting.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
   $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/core/libgnunetcore.la  
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/transport/libgnunettransport.la
+perf_ats_proportional_core_none_DEPENDENCIES = \
+ libgnunetatstesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la
 
-perf_ats_proportional_bandwidth_SOURCES = \
-  perf_ats.c  
-perf_ats_proportional_bandwidth_LDADD = \
+perf_ats_proportional_transport_none_SOURCES = \
+  perf_ats.c
+perf_ats_proportional_transport_none_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/ats-tests/libgnunetatstesting.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
   $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/core/libgnunetcore.la  
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/transport/libgnunettransport.la
+perf_ats_proportional_transport_none_DEPENDENCIES = \
+ libgnunetatstesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la
 
-perf_ats_proportional_latency_SOURCES = \
-  perf_ats.c  
-perf_ats_proportional_latency_LDADD = \
+perf_ats_proportional_core_bandwidth_SOURCES = \
+  perf_ats.c
+perf_ats_proportional_core_bandwidth_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/ats-tests/libgnunetatstesting.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
   $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/core/libgnunetcore.la  
-  
-if HAVE_LIBGLPK
-perf_ats_mlp_none_SOURCES = \
-  perf_ats.c  
-perf_ats_mlp_none_LDADD = \
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/transport/libgnunettransport.la
+perf_ats_proportional_core_bandwidth_DEPENDENCIES = \
+ libgnunetatstesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
+perf_ats_proportional_transport_bandwidth_SOURCES = \
+  perf_ats.c
+perf_ats_proportional_transport_bandwidth_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/ats-tests/libgnunetatstesting.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
   $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/core/libgnunetcore.la  
-  
-perf_ats_mlp_bandwidth_SOURCES = \
-  perf_ats.c  
-perf_ats_mlp_bandwidth_LDADD = \
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/transport/libgnunettransport.la
+perf_ats_proportional_transport_bandwidth_DEPENDENCIES = \
+ libgnunetatstesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+ 
+perf_ats_proportional_core_latency_SOURCES = \
+  perf_ats.c
+perf_ats_proportional_core_latency_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/ats-tests/libgnunetatstesting.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
   $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/core/libgnunetcore.la  
-  
-perf_ats_mlp_latency_SOURCES = \
-  perf_ats.c  
-perf_ats_mlp_latency_LDADD = \
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/transport/libgnunettransport.la
+perf_ats_proportional_core_latency_DEPENDENCIES = \
+ libgnunetatstesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
+perf_ats_proportional_transport_latency_SOURCES = \
+  perf_ats.c
+perf_ats_proportional_transport_latency_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/ats-tests/libgnunetatstesting.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
   $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/core/libgnunetcore.la
-endif
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/transport/libgnunettransport.la
+perf_ats_proportional_transport_latency_DEPENDENCIES = \
+ libgnunetatstesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la
 
-perf_ats_ril_none_SOURCES = \
-  perf_ats.c  
-perf_ats_ril_none_LDADD = \
+perf_ats_mlp_core_none_SOURCES = \
+  perf_ats.c
+perf_ats_mlp_core_none_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/ats-tests/libgnunetatstesting.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
   $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/core/libgnunetcore.la  
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/transport/libgnunettransport.la
+perf_ats_mlp_core_none_DEPENDENCIES = \
+ libgnunetatstesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la
 
-perf_ats_ril_bandwidth_SOURCES = \
-  perf_ats.c  
-perf_ats_ril_bandwidth_LDADD = \
+perf_ats_mlp_transport_none_SOURCES = \
+  perf_ats.c
+perf_ats_mlp_transport_none_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/ats-tests/libgnunetatstesting.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
   $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/core/libgnunetcore.la  
-  
-perf_ats_ril_latency_SOURCES = \
-  perf_ats.c  
-perf_ats_ril_latency_LDADD = \
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/transport/libgnunettransport.la
+perf_ats_mlp_transport_none_DEPENDENCIES = \
+ libgnunetatstesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
+perf_ats_mlp_core_bandwidth_SOURCES = \
+  perf_ats.c
+perf_ats_mlp_core_bandwidth_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/ats-tests/libgnunetatstesting.la \
+  $(top_builddir)/src/testbed/libgnunettestbed.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/transport/libgnunettransport.la
+perf_ats_mlp_core_bandwidth_DEPENDENCIES = \
+ libgnunetatstesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
+perf_ats_mlp_transport_bandwidth_SOURCES = \
+  perf_ats.c
+perf_ats_mlp_transport_bandwidth_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/ats-tests/libgnunetatstesting.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
   $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/core/libgnunetcore.la
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/transport/libgnunettransport.la
+perf_ats_mlp_transport_bandwidth_DEPENDENCIES = \
+ libgnunetatstesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
+perf_ats_mlp_core_latency_SOURCES = \
+  perf_ats.c
+perf_ats_mlp_core_latency_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/ats-tests/libgnunetatstesting.la \
+  $(top_builddir)/src/testbed/libgnunettestbed.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/transport/libgnunettransport.la
+perf_ats_mlp_core_latency_DEPENDENCIES = \
+ libgnunetatstesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
+perf_ats_mlp_transport_latency_SOURCES = \
+  perf_ats.c
+perf_ats_mlp_transport_latency_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/ats-tests/libgnunetatstesting.la \
+  $(top_builddir)/src/testbed/libgnunettestbed.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/transport/libgnunettransport.la
+perf_ats_mlp_transport_latencyDEPENDENCIES = \
+ $(top_builddir)/src/ats-tests/libgnunetatstesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
+#perf_ats_ril_core_none_SOURCES = \
+#  perf_ats.c
+#perf_ats_ril_core_none_LDADD = \
+#  $(top_builddir)/src/util/libgnunetutil.la \
+#  $(top_builddir)/src/ats-tests/libgnunetatstesting.la \
+#  $(top_builddir)/src/testbed/libgnunettestbed.la \
+#  $(top_builddir)/src/ats/libgnunetats.la \
+#  $(top_builddir)/src/core/libgnunetcore.la \
+#  $(top_builddir)/src/transport/libgnunettransport.la
+#perf_ats_ril_core_none_DEPENDENCIES = \
+# libgnunetatstesting.la \
+# $(top_builddir)/src/util/libgnunetutil.la
+
 
 EXTRA_DIST = \
+	gnunet_ats_sim_default.conf \
   perf_ats_proportional_none.conf \
   perf_ats_proportional_bandwidth.conf \
   perf_ats_proportional_latency.conf \