projects / oweals / gnunet.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
-rename file to match updated functionality
[oweals/gnunet.git] / src / ats-tests / Makefile.am
diff --git a/src/ats-tests/Makefile.am b/src/ats-tests/Makefile.am
index 22b5592a8703783535f4c6ef47f4a1c036263b1f..55fda3a47e6a40c0fd771038fedc7176e22faf9f 100644 (file)
--- a/src/ats-tests/Makefile.am
+++ b/src/ats-tests/Makefile.am
@@ -28,42 +28,39 @@ TESTING_TESTS = \
  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
+ 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 
+  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
 
 noinst_PROGRAMS = \
- gnunet-ats-sim
- 
+ gnunet-ats-sim gnunet-solver-eval
+
 libgnunetatstesting_la_SOURCES = \
-  ats-testing.c ats-testing.h
+  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_LDADD = \
@@ -72,14 +69,24 @@ gnunet_ats_sim_LDADD = \
  $(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 = \
- $(top_builddir)/src/ats-tests/libgnunetatstesting.la \
+ 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_logging.c perf_ats.h
+  perf_ats.c
 perf_ats_proportional_core_none_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/ats-tests/libgnunetatstesting.la \
@@ -87,12 +94,12 @@ 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 = \
- $(top_builddir)/src/ats-tests/libgnunetatstesting.la \
- $(top_builddir)/src/util/libgnunetutil.la  
+perf_ats_proportional_core_none_DEPENDENCIES = \
+ libgnunetatstesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la
 
 perf_ats_proportional_transport_none_SOURCES = \
-  perf_ats.c perf_ats_logging.c
+  perf_ats.c
 perf_ats_proportional_transport_none_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/ats-tests/libgnunetatstesting.la \
@@ -100,157 +107,156 @@ perf_ats_proportional_transport_none_LDADD = \
   $(top_builddir)/src/ats/libgnunetats.la \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/transport/libgnunettransport.la
-perf_ats_proportional_transport_DEPENDENCIES = \
- $(top_builddir)/src/ats-tests/libgnunetatstesting.la \
- $(top_builddir)/src/util/libgnunetutil.la  
+perf_ats_proportional_transport_none_DEPENDENCIES = \
+ libgnunetatstesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la
 
 perf_ats_proportional_core_bandwidth_SOURCES = \
-  perf_ats.c perf_ats_logging.c
+  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 \
   $(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_logging.c
+  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 \
   $(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_logging.c
+  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 \
   $(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_logging.c
+  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 \
   $(top_builddir)/src/transport/libgnunettransport.la
+perf_ats_proportional_transport_latency_DEPENDENCIES = \
+ libgnunetatstesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la
 
-if HAVE_LIBGLPK
 perf_ats_mlp_core_none_SOURCES = \
-  perf_ats.c perf_ats_logging.c
+  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/transport/libgnunettransport.la
+perf_ats_mlp_core_none_DEPENDENCIES = \
+ libgnunetatstesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la
 
 perf_ats_mlp_transport_none_SOURCES = \
-  perf_ats.c perf_ats_logging.c
+  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 \
   $(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_logging.c
+  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_logging.c
+  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/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_logging.c
+  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_logging.c
+  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
-endif
-
-perf_ats_ril_core_none_SOURCES = \
-  perf_ats.c perf_ats_logging.c
-perf_ats_ril_core_none_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.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_SOURCES = \
-  perf_ats.c perf_ats_logging.c
-perf_ats_ril_transport_none_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.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_SOURCES = \
-  perf_ats.c perf_ats_logging.c
-perf_ats_ril_core_bandwidth_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.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_transport_bandwidth_SOURCES = \
-  perf_ats.c perf_ats_logging.c
-perf_ats_ril_transport_bandwidth_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.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_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_core_latency_SOURCES = \
-  perf_ats.c perf_ats_logging.c
-perf_ats_ril_core_latency_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.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_SOURCES = \
-  perf_ats.c perf_ats_logging.c
-perf_ats_ril_transport_latency_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.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
 
 EXTRA_DIST = \
+       gnunet_ats_sim_default.conf \
   perf_ats_proportional_none.conf \
   perf_ats_proportional_bandwidth.conf \
   perf_ats_proportional_latency.conf \
Unnamed repository; edit this file 'description' to name the repository.