sort tests by solver and comment ril out until working

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

diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am
index d280a1ab0a72fcfbd2c269e2c2ca28810ade8c48..1fbd434ee2b9e2da4d161f87b3f10b8a7a7dab29 100644 (file)
--- a/src/ats/Makefile.am
+++ b/src/ats/Makefile.am
@@ -22,6 +22,12 @@ if HAVE_LIBGLPK
   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
@@ -77,8 +83,21 @@ TESTING_TESTS = \
  test_ats_api_performance_monitor \
  test_ats_api_performance_monitor_initial_callback \
  test_ats_solver_add_address_proportional \
- test_ats_solver_add_address_mlp \
- test_ats_solver_add_address_ril
+ 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
@@ -223,7 +242,8 @@ test_ats_api_performance_monitor_initial_callback_LDADD = \
        
 # solver tests
 test_ats_solver_add_address_proportional_SOURCES = \
- test_ats_solver_add_address.c 
+ 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 \
@@ -231,17 +251,21 @@ test_ats_solver_add_address_proportional_LDADD = \
   $(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_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_solver_add_address.c \
+ test_ats_api_common.c test_ats_api_common.h
 test_ats_solver_add_address_ril_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
@@ -249,6 +273,137 @@ test_ats_solver_add_address_ril_LDADD = \
   $(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 = \
+  $(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
+
+
+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 = \
+  $(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
+
+
+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 = \
+  $(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
+
+
+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
@@ -334,7 +489,7 @@ test_ats_solver_add_address_ril_LDADD = \
 #  $(top_builddir)/src/testing/libgnunettesting.la \
 #  $(top_builddir)/src/ats/libgnunetats.la
 
-if HAVE_LIBGLPK
+
 #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 = \
@@ -358,7 +513,6 @@ if HAVE_LIBGLPK
 #  $(top_builddir)/src/util/libgnunetutil.la \
 #  $(top_builddir)/src/statistics/libgnunetstatistics.la \
 #  $(top_builddir)/src/ats/libgnunetats.la  
-endif  
 
 #test_ats_normalization_update_quality_SOURCES = \
 #  test_ats_normalization_update_quality.c test_ats_api_common.c
@@ -372,4 +526,8 @@ endif
 EXTRA_DIST = \
   ats.h \
   test_ats_api.conf \
-  test_ats_mlp.conf
\ No newline at end of file
+  test_ats_mlp.conf \
+  test_ats_solver_default.conf \
+  test_ats_solver_proportional.conf \
+  test_ats_solver_mlp.conf \
+  test_ats_solver_ril.conf