- rename also contents of config files, update config files

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

diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index 3e47add6b45d2eebb7859acd7652fd33b0a11173..899708102f6324f7cb290e9123718964369790c7 100644 (file)
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
   WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
@@ -9,219 +9,92 @@ if USE_COVERAGE
   XLIB = -lgcov
 endif
 
-lib_LTLIBRARIES = libgnunettesting.la
+pkgcfgdir= $(pkgdatadir)/config.d/
 
-libgnunettesting_la_SOURCES = \
-  testing.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 
-
-check_PROGRAMS = \
- test_testing \
- test_testing_connect \
- test_testing_reconnect \
- test_testing_group \
- test_testing_peergroup \
- test_testing_topology_stability \
- test_testing_topology_clique \
- 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_none \
- test_testing_topology_scale_free
-
-if !DISABLE_TEST_RUN 
-TESTS = \
- test_testing \
- test_testing_connect \
- test_testing_reconnect \
- test_testing_group \
- test_testing_peergroup \
- test_testing_topology_clique
-# 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
-
-test_testing_SOURCES = \
- test_testing.c
-test_testing_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la  
-
-test_testing_connect_SOURCES = \
- test_testing_connect.c
-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/util/libgnunetutil.la
+dist_pkgcfg_DATA = \
+  testing.conf
 
-test_testing_topology_stability_SOURCES = \
- test_testing_topology.c
-test_testing_topology_stability_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
+lib_LTLIBRARIES = \
+  libgnunettesting.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/util/libgnunetutil.la  
+libgnunettesting_la_SOURCES = \
+  testing.c  
+libgnunettesting_la_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/arm/libgnunetarm.la \
+ $(LTLIBINTL)
+libgnunettesting_la_LDFLAGS = \
+ $(GN_LIB_LDFLAGS) \
+ -version-info 2:0:1
 
-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/util/libgnunetutil.la
+bin_PROGRAMS = \
+ gnunet-testing
 
-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/util/libgnunetutil.la  
+noinst_PROGRAMS = \
+ list-keys
 
-test_testing_topology_line_SOURCES = \
- test_testing_topology.c
-test_testing_topology_line_LDADD = \
+gnunet_testing_SOURCES = \
+ gnunet-testing.c         
+gnunet_testing_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la  
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(GN_LIBINTL)
+gnunet_testing_DEPENDENCIES = \
+ libgnunettesting.la
 
+list_keys_SOURCES = \
+ list-keys.c
+list_keys_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(GN_LIBINTL)
 
-test_testing_group_remote_SOURCES = \
- test_testing_group_remote.c
-test_testing_group_remote_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/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/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/util/libgnunetutil.la
+check_PROGRAMS = \
+ test_testing_portreservation \
+ test_testing_servicestartup \
+ test_testing_peerstartup \
+ test_testing_peerstartup2 \
+ test_testing_sharedservices
+
+if ENABLE_TEST_RUN 
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+TESTS = \
+ test_testing_portreservation \
+ test_testing_peerstartup \
+ test_testing_peerstartup2 \
+ test_testing_servicestartup
+endif
 
-test_testing_topology_small_world_torus_SOURCES = \
-  test_testing_topology.c
-test_testing_topology_small_world_torus_LDADD = \
+test_testing_portreservation_SOURCES = \
+ test_testing_portreservation.c
+test_testing_portreservation_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
-test_testing_topology_internat_SOURCES = \
-  test_testing_topology.c
-test_testing_topology_internat_LDADD = \
+test_testing_peerstartup_SOURCES = \
+ test_testing_peerstartup.c
+test_testing_peerstartup_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
-test_testing_topology_erdos_renyi_SOURCES = \
-  test_testing_topology.c
-test_testing_topology_erdos_renyi_LDADD = \
+test_testing_peerstartup2_SOURCES = \
+ test_testing_peerstartup2.c
+test_testing_peerstartup2_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
-test_testing_topology_scale_free_SOURCES = \
-  test_testing_topology.c
-test_testing_topology_scale_free_LDADD = \
+test_testing_servicestartup_SOURCES = \
+ test_testing_servicestartup.c
+test_testing_servicestartup_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
-test_testing_topology_none_SOURCES = \
- test_testing_topology.c
-test_testing_topology_none_LDADD = \
+test_testing_sharedservices_SOURCES = \
+ test_testing_sharedservices.c
+test_testing_sharedservices_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
-
 EXTRA_DIST = \
- test_testing_data.conf \
- test_testing_connect_peer1.conf \
- test_testing_connect_peer2.conf \
- test_testing_data_topology_clique.conf \
- test_testing_data_topology_clique_random.conf \
- test_testing_data_topology_clique_minimum.conf \
- test_testing_data_topology_clique_dfs.conf \
- test_testing_data_topology_ring.conf \
- test_testing_data_topology_2d_torus.conf \
- test_testing_data_topology_small_world_ring.conf \
- test_testing_data_topology_small_world_torus.conf \
- test_testing_data_topology_erdos_renyi.conf \
- test_testing_data_topology_internat.conf \
- 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_defaults.conf