-major DHT test cleanup

1 files changed, 21 insertions, 52 deletions

diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am
index 982c33815..0baf6b00e 100644
--- a/src/dht/Makefile.am
+++ b/src/dht/Makefile.am
@@ -123,27 +123,23 @@ libgnunetdhttest_a_DEPENDENCIES = \
 check_PROGRAMS = \
  test_dht_api \
  test_dht_twopeer \
- test_dht_twopeer_put_get \
- test_dht_twopeer_get_put \
- test_dht_twopeer_path_tracking \
  test_dht_multipeer \
  test_dht_line \
- test_dht_2dtorus \
- test_dht_monitor
+ test_dht_2dtorus 
+# test_dht_monitor
 
 if HAVE_EXPERIMENTAL
- NEW_TESTS = test_dht_line test_dht_2dtorus
+# These tests still do not work as testbed does
+# not support the respective topology op
+ NEW_TESTS = test_dht_2dtorus test_dht_multipeer
 endif
 
 if ENABLE_TEST_RUN
 TESTS = test_dht_api $(check_SCRIPTS) \
  test_dht_twopeer \
- test_dht_twopeer_put_get \
- test_dht_twopeer_get_put \
- test_dht_twopeer_path_tracking \
- test_dht_multipeer \
- $(NEW_TESTS) \
- test_dht_monitor
+ test_dht_line \
+ $(NEW_TESTS) 
+# test_dht_monitor
 endif
 
 test_dht_api_SOURCES = \
@@ -156,9 +152,8 @@ test_dht_api_LDADD = \
 test_dht_api_DEPENDENCIES = \
   libgnunetdht.la                           
 
-# twopeer is obsolete once new test_dht_topo works...
 test_dht_twopeer_SOURCES = \
- test_dht_twopeer.c
+ test_dht_topo.c
 test_dht_twopeer_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testing_old/libgnunettesting_old.la \
@@ -166,42 +161,6 @@ test_dht_twopeer_LDADD = \
 test_dht_twopeer_DEPENDENCIES = \
   libgnunetdht.la                           
 
-# twopeer_put_get is obsolete once new test_dht_topo works...
-test_dht_twopeer_put_get_SOURCES = \
- test_dht_twopeer_put_get.c
-test_dht_twopeer_put_get_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing_old/libgnunettesting_old.la \
- $(top_builddir)/src/dht/libgnunetdht.la   
-
-# twopeer_get_put is obsolete once new test_dht_topo works...
-test_dht_twopeer_get_put_SOURCES = \
- test_dht_twopeer_get_put.c
-test_dht_twopeer_get_put_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing_old/libgnunettesting_old.la \
- $(top_builddir)/src/dht/libgnunetdht.la   
-
-# twopeer_path_tracking is obsolete once new test_dht_topo works...
-test_dht_twopeer_path_tracking_SOURCES = \
- test_dht_twopeer_path_tracking.c
-test_dht_twopeer_path_tracking_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing_old/libgnunettesting_old.la \
- $(top_builddir)/src/dht/libgnunetdht.la   
-
-# statistics functions should be integrated with test_dht_topo,
-# then this one also becomes obsolete...
-test_dht_multipeer_SOURCES = \
- test_dht_multipeer.c
-test_dht_multipeer_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/testing_old/libgnunettesting_old.la \
- $(top_builddir)/src/dht/libgnunetdht.la  
-test_dht_multipeer_DEPENDENCIES = \
-  libgnunetdht.la                           
-
 test_dht_2dtorus_SOURCES = \
  test_dht_topo.c
 test_dht_2dtorus_LDADD = \
@@ -222,6 +181,16 @@ test_dht_line_LDADD = \
 test_dht_line_DEPENDENCIES = \
   libgnunetdht.la
 
+test_dht_multipeer_SOURCES = \
+ test_dht_topo.c
+test_dht_multipeer_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/testing_old/libgnunettesting_old.la \
+ $(top_builddir)/src/dht/libgnunetdht.la  
+test_dht_multipeer_DEPENDENCIES = \
+  libgnunetdht.la                           
+
 # fixme, rewrite based on test_dht_topo.c!
 test_dht_monitor_SOURCES = test_dht_monitor.c
 test_dht_monitor_LDADD = \
@@ -236,11 +205,11 @@ EXTRA_DIST = \
   test_dht_api_data.conf \
   test_dht_api_peer1.conf \
   test_dht_twopeer_data.conf \
-  test_dht_multipeer_data.conf \
+  test_dht_multipeer.conf \
   test_dht_2dtorus.conf \
   test_dht_line.conf \
   test_dht_tools.py.in \
-  multipeer_topo.dat
+  test_dht_multipeer_topology.dat
 
 check_SCRIPTS = \
   test_dht_tools.py