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

diff --git a/src/ats-tests/Makefile.am b/src/ats-tests/Makefile.am
index 237acf879..55fda3a47 100644
--- a/src/ats-tests/Makefile.am
+++ b/src/ats-tests/Makefile.am
@@ -29,57 +29,62 @@ TESTING_TESTS = \
  perf_ats_proportional_core_bandwidth \
  perf_ats_proportional_transport_latency \
  perf_ats_proportional_core_latency \
- 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 \
  $(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 
+  libgnunetatstesting.la
 
 check_PROGRAMS = \
  $(TESTING_TESTS)
 
 if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
 TESTS = $(check_PROGRAMS)
 endif
 
 noinst_PROGRAMS = \
- gnunet-ats-sim
- 
+ gnunet-ats-sim gnunet-solver-eval
+
 libgnunetatstesting_la_SOURCES = \
-  ats-testing.c ats-testing-log.c ats-testing-traffic.c \
-  ats-testing-experiment.c
+  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/transport/libgnunettransport.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/testbed/libgnunettestbed.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
   $(GN_LIBINTL)
-libgnunettransporttesting_la_DEPENDENCIES = \
-  libgnunettransport.la
-libgnunettransporttesting_la_LDFLAGS = \
+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.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  
+ $(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 = \
@@ -89,9 +94,9 @@ perf_ats_proportional_core_none_LDADD = \
   $(top_builddir)/src/ats/libgnunetats.la \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/transport/libgnunettransport.la
-perf_ats_proportional_core_DEPENDENCIES = \
+perf_ats_proportional_core_none_DEPENDENCIES = \
  libgnunetatstesting.la \
- $(top_builddir)/src/util/libgnunetutil.la  
+ $(top_builddir)/src/util/libgnunetutil.la
 
 perf_ats_proportional_transport_none_SOURCES = \
   perf_ats.c
@@ -104,7 +109,7 @@ perf_ats_proportional_transport_none_LDADD = \
   $(top_builddir)/src/transport/libgnunettransport.la
 perf_ats_proportional_transport_none_DEPENDENCIES = \
  libgnunetatstesting.la \
- $(top_builddir)/src/util/libgnunetutil.la    
+ $(top_builddir)/src/util/libgnunetutil.la
 
 perf_ats_proportional_core_bandwidth_SOURCES = \
   perf_ats.c
@@ -117,7 +122,7 @@ perf_ats_proportional_core_bandwidth_LDADD = \
   $(top_builddir)/src/transport/libgnunettransport.la
 perf_ats_proportional_core_bandwidth_DEPENDENCIES = \
  libgnunetatstesting.la \
- $(top_builddir)/src/util/libgnunetutil.la  
+ $(top_builddir)/src/util/libgnunetutil.la
 
 perf_ats_proportional_transport_bandwidth_SOURCES = \
   perf_ats.c
@@ -130,8 +135,8 @@ perf_ats_proportional_transport_bandwidth_LDADD = \
   $(top_builddir)/src/transport/libgnunettransport.la
 perf_ats_proportional_transport_bandwidth_DEPENDENCIES = \
  libgnunetatstesting.la \
- $(top_builddir)/src/util/libgnunetutil.la    
-
+ $(top_builddir)/src/util/libgnunetutil.la
+ 
 perf_ats_proportional_core_latency_SOURCES = \
   perf_ats.c
 perf_ats_proportional_core_latency_LDADD = \
@@ -143,8 +148,8 @@ perf_ats_proportional_core_latency_LDADD = \
   $(top_builddir)/src/transport/libgnunettransport.la
 perf_ats_proportional_core_latency_DEPENDENCIES = \
  libgnunetatstesting.la \
- $(top_builddir)/src/util/libgnunetutil.la  
-  
+ $(top_builddir)/src/util/libgnunetutil.la
+
 perf_ats_proportional_transport_latency_SOURCES = \
   perf_ats.c
 perf_ats_proportional_transport_latency_LDADD = \
@@ -156,9 +161,8 @@ perf_ats_proportional_transport_latency_LDADD = \
   $(top_builddir)/src/transport/libgnunettransport.la
 perf_ats_proportional_transport_latency_DEPENDENCIES = \
  libgnunetatstesting.la \
- $(top_builddir)/src/util/libgnunetutil.la    
+ $(top_builddir)/src/util/libgnunetutil.la
 
-if HAVE_LIBGLPK
 perf_ats_mlp_core_none_SOURCES = \
   perf_ats.c
 perf_ats_mlp_core_none_LDADD = \
@@ -170,8 +174,8 @@ perf_ats_mlp_core_none_LDADD = \
   $(top_builddir)/src/transport/libgnunettransport.la
 perf_ats_mlp_core_none_DEPENDENCIES = \
  libgnunetatstesting.la \
- $(top_builddir)/src/util/libgnunetutil.la    
-  
+ $(top_builddir)/src/util/libgnunetutil.la
+
 perf_ats_mlp_transport_none_SOURCES = \
   perf_ats.c
 perf_ats_mlp_transport_none_LDADD = \
@@ -183,7 +187,7 @@ perf_ats_mlp_transport_none_LDADD = \
   $(top_builddir)/src/transport/libgnunettransport.la
 perf_ats_mlp_transport_none_DEPENDENCIES = \
  libgnunetatstesting.la \
- $(top_builddir)/src/util/libgnunetutil.la    
+ $(top_builddir)/src/util/libgnunetutil.la
 
 perf_ats_mlp_core_bandwidth_SOURCES = \
   perf_ats.c
@@ -196,7 +200,7 @@ perf_ats_mlp_core_bandwidth_LDADD = \
   $(top_builddir)/src/transport/libgnunettransport.la
 perf_ats_mlp_core_bandwidth_DEPENDENCIES = \
  libgnunetatstesting.la \
- $(top_builddir)/src/util/libgnunetutil.la    
+ $(top_builddir)/src/util/libgnunetutil.la
 
 perf_ats_mlp_transport_bandwidth_SOURCES = \
   perf_ats.c
@@ -209,7 +213,7 @@ perf_ats_mlp_transport_bandwidth_LDADD = \
   $(top_builddir)/src/transport/libgnunettransport.la
 perf_ats_mlp_transport_bandwidth_DEPENDENCIES = \
  libgnunetatstesting.la \
- $(top_builddir)/src/util/libgnunetutil.la    
+ $(top_builddir)/src/util/libgnunetutil.la
 
 perf_ats_mlp_core_latency_SOURCES = \
   perf_ats.c
@@ -222,7 +226,7 @@ perf_ats_mlp_core_latency_LDADD = \
   $(top_builddir)/src/transport/libgnunettransport.la
 perf_ats_mlp_core_latency_DEPENDENCIES = \
  libgnunetatstesting.la \
- $(top_builddir)/src/util/libgnunetutil.la    
+ $(top_builddir)/src/util/libgnunetutil.la
 
 perf_ats_mlp_transport_latency_SOURCES = \
   perf_ats.c
@@ -235,87 +239,21 @@ perf_ats_mlp_transport_latency_LDADD = \
   $(top_builddir)/src/transport/libgnunettransport.la
 perf_ats_mlp_transport_latencyDEPENDENCIES = \
  $(top_builddir)/src/ats-tests/libgnunetatstesting.la \
- $(top_builddir)/src/util/libgnunetutil.la    
-endif
-
-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    
-
-perf_ats_ril_transport_none_SOURCES = \
-  perf_ats.c
-perf_ats_ril_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/transport/libgnunettransport.la
-perf_ats_ril_transport_none_DEPENDENCIES = \
- libgnunetatstesting.la \
- $(top_builddir)/src/util/libgnunetutil.la    
+ $(top_builddir)/src/util/libgnunetutil.la
 
-perf_ats_ril_core_bandwidth_SOURCES = \
-  perf_ats.c
-perf_ats_ril_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_ril_core_bandwidth_DEPENDENCIES = \
- 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
 
-perf_ats_ril_transport_bandwidth_SOURCES = \
-  perf_ats.c
-perf_ats_ril_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/transport/libgnunettransport.la
-perf_ats_ril_transport_DEPENDENCIES = \
- libgnunetatstesting.la \
- $(top_builddir)/src/util/libgnunetutil.la  
-   
-
-perf_ats_ril_core_latency_SOURCES = \
-  perf_ats.c
-perf_ats_ril_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_ril_core_latency_DEPENDENCIES = \
- libgnunetatstesting.la \
- $(top_builddir)/src/util/libgnunetutil.la  
- 
-perf_ats_ril_transport_latency_SOURCES = \
-  perf_ats.c
-perf_ats_ril_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_ril_transport_latency_DEPENDENCIES = \
- libgnunetatstesting.la \
- $(top_builddir)/src/util/libgnunetutil.la  
 
 EXTRA_DIST = \
 	gnunet_ats_sim_default.conf \