-fixes

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

diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index f6035ff2c44cf86d9a90544e41b6e00d83b7390e..050691d13ae8d42ed0192f125ee1396a7729e4d2 100644 (file)
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -9,28 +9,58 @@ if USE_COVERAGE
   XLIB = -lgcov
 endif
 
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+dist_pkgcfg_DATA = \
+  testing.conf
+
+if HAVE_EXPENSIVE_TESTS
+  EXPENSIVE_TESTS = \
+   test_testing_topology_stability \
+   test_testing_topology_clique_random \
+   test_testing_topology_clique_minimum \
+   test_testing_topology_clique_dfs \
+   test_testing_topology_churn \
+   test_testing_topology_line
+   test_testing_topology_blacklist \
+   test_testing_group_remote \
+   test_testing_topology_ring \
+   test_testing_topology_2d_torus \
+   test_testing_topology_small_world_ring \
+   test_testing_topology_small_world_torus \
+   test_testing_topology_erdos_renyi \
+   test_testing_topology_internat \
+   test_testing_topology_scale_free
+endif
+
 lib_LTLIBRARIES = libgnunettesting.la
 
 libgnunettesting_la_SOURCES = \
+  helper.c \
   testing.c  \
-  testing_group.c 
+  testing_group.c \
+  testing_peergroup.c
 libgnunettesting_la_LIBADD = $(XLIB) \
  $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
  -lm \
  $(top_builddir)/src/util/libgnunetutil.la 
- 
-noinst_PROGRAMS = ${check_PROGRAMS}
+libgnunettesting_la_LDFLAGS = \
+ $(GN_LIB_LDFLAGS) \
+ -version-info 0:1:0
+
+bin_PROGRAMS = \
+ gnunet-testing
 
 check_PROGRAMS = \
  test_testing \
  test_testing_connect \
  test_testing_reconnect \
  test_testing_group \
+ test_testing_peergroup \
  test_testing_topology_stability \
- test_testing_large_topology_clique \
- test_testing_topology_from_file \
  test_testing_topology_clique \
  test_testing_topology_clique_random \
  test_testing_topology_clique_minimum \
@@ -39,6 +69,7 @@ check_PROGRAMS = \
  test_testing_topology_line \
  test_testing_topology_blacklist \
  test_testing_group_remote \
+ test_testing_2dtorus \
  test_testing_topology_ring \
  test_testing_topology_2d_torus \
  test_testing_topology_small_world_ring \
@@ -46,37 +77,29 @@ check_PROGRAMS = \
  test_testing_topology_erdos_renyi \
  test_testing_topology_internat \
  test_testing_topology_none \
- test_testing_topology_scale_free \
- test_testing_topology_connect_only \
- test_testing_topology_2d_torus_plus
+ test_testing_topology_scale_free
 
-# test_testing_topology_stability
-if !DISABLE_TEST_RUN 
+if ENABLE_TEST_RUN 
 TESTS = \
  test_testing \
  test_testing_connect \
  test_testing_reconnect \
  test_testing_group \
+ test_testing_peergroup \
  test_testing_topology_clique \
- test_testing_topology_from_file \
- test_testing_topology_clique_random \
- test_testing_topology_clique_minimum \
- test_testing_topology_clique_dfs \
- test_testing_topology_churn \
- test_testing_topology_line \
- test_testing_topology_blacklist \
- test_testing_group_remote \
- test_testing_topology_ring \
- test_testing_topology_2d_torus \
- test_testing_topology_small_world_ring \
- test_testing_topology_small_world_torus \
- test_testing_topology_erdos_renyi \
- test_testing_topology_internat \
- test_testing_topology_scale_free \
- test_testing_topology_connect_only \
- test_testing_topology_2d_torus_plus
+ test_testing_2dtorus
 endif
 
+gnunet_testing_SOURCES = \
+ gnunet-testing.c         
+gnunet_testing_LDADD = \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(GN_LIBINTL)
+gnunet_testing_DEPENDENCIES = \
+ libgnunettesting.la
+
+
 test_testing_SOURCES = \
  test_testing.c
 test_testing_LDADD = \
@@ -89,83 +112,78 @@ test_testing_connect_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
+test_testing_reconnect_SOURCES = \
+ test_testing_reconnect.c
+test_testing_reconnect_LDADD = \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la  
+
 test_testing_group_SOURCES = \
  test_testing_group.c
 test_testing_group_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la  
- 
+
+test_testing_peergroup_SOURCES = \
+ test_testing_peergroup.c
+test_testing_peergroup_LDADD = \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la 
+
 test_testing_topology_clique_SOURCES = \
  test_testing_topology.c
 test_testing_topology_clique_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/util/libgnunetutil.la
- 
-test_testing_topology_connect_only_SOURCES = \
- test_testing_topology.c
-test_testing_topology_connect_only_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
- 
-test_testing_topology_from_file_SOURCES = \
- test_testing_topology.c
-test_testing_topology_from_file_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
- 
-test_testing_large_topology_clique_SOURCES = \
- test_testing_large_topology.c
-test_testing_large_topology_clique_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
- 
+
 test_testing_topology_stability_SOURCES = \
  test_testing_topology.c
 test_testing_topology_stability_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/util/libgnunetutil.la
- 
+
 test_testing_topology_blacklist_SOURCES = \
  test_testing_topology_blacklist.c
 test_testing_topology_blacklist_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la 
- 
+
 test_testing_topology_churn_SOURCES = \
  test_testing_topology_churn.c
 test_testing_topology_churn_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la 
- 
+
 test_testing_topology_clique_random_SOURCES = \
  test_testing_topology.c
 test_testing_topology_clique_random_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 test_testing_topology_clique_minimum_SOURCES = \
  test_testing_topology.c
 test_testing_topology_clique_minimum_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/util/libgnunetutil.la
- 
+
 test_testing_topology_clique_dfs_SOURCES = \
  test_testing_topology.c
 test_testing_topology_clique_dfs_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 test_testing_topology_line_SOURCES = \
  test_testing_topology.c
 test_testing_topology_line_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/util/libgnunetutil.la  
-   
-test_testing_reconnect_SOURCES = \
- test_testing_reconnect.c
-test_testing_reconnect_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
+
 
 test_testing_group_remote_SOURCES = \
  test_testing_group_remote.c
@@ -173,65 +191,75 @@ test_testing_group_remote_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
+test_testing_2dtorus_SOURCES = \
+  test_testing_2dtorus.c
+test_testing_2dtorus_LDADD = \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la 
+
 test_testing_topology_ring_SOURCES = \
  test_testing_topology.c
 test_testing_topology_ring_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/util/libgnunetutil.la  
- 
+
 test_testing_topology_2d_torus_SOURCES = \
   test_testing_topology.c
 test_testing_topology_2d_torus_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/util/libgnunetutil.la 
- 
-test_testing_topology_2d_torus_plus_SOURCES = \
-  test_testing_topology.c
-test_testing_topology_2d_torus_plus_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la 
- 
+
 test_testing_topology_small_world_ring_SOURCES = \
   test_testing_topology.c
 test_testing_topology_small_world_ring_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/util/libgnunetutil.la
- 
+
 test_testing_topology_small_world_torus_SOURCES = \
   test_testing_topology.c
 test_testing_topology_small_world_torus_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/util/libgnunetutil.la
- 
+
 test_testing_topology_internat_SOURCES = \
   test_testing_topology.c
 test_testing_topology_internat_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
 test_testing_topology_erdos_renyi_SOURCES = \
   test_testing_topology.c
 test_testing_topology_erdos_renyi_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/util/libgnunetutil.la
- 
+
 test_testing_topology_scale_free_SOURCES = \
   test_testing_topology.c
 test_testing_topology_scale_free_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
 test_testing_topology_none_SOURCES = \
  test_testing_topology.c
 test_testing_topology_none_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/util/libgnunetutil.la
- 
- 
+
+
 EXTRA_DIST = \
+ test_testing_defaults.conf \
  test_testing_data.conf \
  test_testing_connect_peer1.conf \
  test_testing_connect_peer2.conf \
+ test_testing_2dtorus.conf \
  test_testing_data_topology_clique.conf \
  test_testing_data_topology_clique_random.conf \
  test_testing_data_topology_clique_minimum.conf \
@@ -245,5 +273,7 @@ EXTRA_DIST = \
  test_testing_data_topology_scale_free.conf \
  test_testing_data_topology_blacklist.conf \
  test_testing_data_topology_churn.conf \
- test_testing_data_topology_none.conf
- 
+ test_testing_data_topology_none.conf \
+ test_testing_data_remote.conf \
+ test_testing_data_topology_stability.conf \
+ test_testing_peergroup_data.conf