-remove unnecessary arguments from ARM callbacks

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

diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index 1041dd90158543bcc540b73a191cccea27a0a356..02a62e57f33a966fcae694f4f571e9d142a7f7b3 100644 (file)
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -9,121 +9,88 @@ if USE_COVERAGE
   XLIB = -lgcov
 endif
 
-lib_LTLIBRARIES = libgnunettesting.la
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+dist_pkgcfg_DATA = \
+  testing.conf
+
+lib_LTLIBRARIES = \
+  libgnunettesting.la 
 
 libgnunettesting_la_SOURCES = \
-  testing.c  \
-  testing_group.c \
-  testing_testbed.c 
-libgnunettesting_la_LIBADD = $(XLIB) \
- $(top_builddir)/src/core/libgnunetcore.la \
- $(top_builddir)/src/transport/libgnunettransport.la \
- -lm \
- $(top_builddir)/src/util/libgnunetutil.la 
+  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
+
+bin_PROGRAMS = \
+ gnunet-testing-run-service \
+ gnunet-testing
+
+
+gnunet_testing_run_service_SOURCES = \
+ gnunet-testing-run-service.c
+
+gnunet_testing_run_service_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(GN_LIBINTL)
+gnunet_testing_run_service_DEPENDENCIES = \
+  libgnunettesting.la
+
+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
+
 
 check_PROGRAMS = \
- test_testing \
- test_testing_connect \
- test_testing_group \
- test_testing_topology_clique 
-# 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_portreservation \
+ test_testing_servicestartup \
+ test_testing_peerstartup \
+ test_testing_peerstartup2
+
+if ENABLE_TEST_RUN 
 TESTS = \
- test_testing \
- test_testing_connect \
- test_testing_group \
- test_testing_topology_clique 
-# 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
-#$(check_PROGRAMS)
-
-test_testing_SOURCES = \
- test_testing.c
-test_testing_LDADD = \
+ test_testing_portreservation \
+ test_testing_peerstartup \
+ test_testing_peerstartup2 \
+ test_testing_servicestartup
+
+endif
+
+test_testing_portreservation_SOURCES = \
+ test_testing_portreservation.c
+test_testing_portreservation_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la  
+ $(top_builddir)/src/util/libgnunetutil.la
 
-test_testing_connect_SOURCES = \
- test_testing_connect.c
-test_testing_connect_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  
+ $(top_builddir)/src/util/libgnunetutil.la
 
-test_testing_group_SOURCES = \
- test_testing_group.c
-test_testing_group_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_clique_SOURCES = \
- test_testing_topology.c
-test_testing_topology_clique_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la
+
+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_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
- 
-#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/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/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/util/libgnunetutil.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_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_defaults.conf