X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftesting%2FMakefile.am;h=572c0333011ccb3317678a38b1ad6a17df5c688c;hb=0c0e1876f6fbd88b15ab5bad49ab6ce22706d03c;hp=88102e112cba7135f467a3ff0e8acf4fa35f1ef6;hpb=29c724d2a7764f83fe846b418d09540348b86983;p=oweals%2Fgnunet.git

diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index 88102e112..572c03330 100644
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -21,7 +21,7 @@ if HAVE_EXPENSIVE_TESTS
    test_testing_topology_clique_minimum \
    test_testing_topology_clique_dfs \
    test_testing_topology_churn \
-   test_testing_topology_line
+   test_testing_topology_line \
    test_testing_topology_blacklist \
    test_testing_group_remote \
    test_testing_topology_ring \
@@ -33,9 +33,12 @@ if HAVE_EXPENSIVE_TESTS
    test_testing_topology_scale_free
 endif
 
-lib_LTLIBRARIES = libgnunettesting.la
+lib_LTLIBRARIES = \
+  libgnunettesting.la \
+  libgnunettesting_new.la
 
 libgnunettesting_la_SOURCES = \
+  helper.c \
   testing.c  \
   testing_group.c \
   testing_peergroup.c
@@ -46,6 +49,22 @@ libgnunettesting_la_LIBADD = $(XLIB) \
  $(top_builddir)/src/hello/libgnunethello.la \
  -lm \
  $(top_builddir)/src/util/libgnunetutil.la 
+libgnunettesting_la_LDFLAGS = \
+ $(GN_LIB_LDFLAGS) \
+ -version-info 0:1:0
+
+
+libgnunettesting_new_la_SOURCES = \
+  testing_new.c  
+libgnunettesting_new_la_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la 
+libgnunettesting_new_la_LDFLAGS = \
+ $(GN_LIB_LDFLAGS) \
+ -version-info 0:1:0
+
+
+bin_PROGRAMS = \
+ gnunet-testing
 
 check_PROGRAMS = \
  test_testing \
@@ -62,6 +81,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 \
@@ -69,7 +89,10 @@ check_PROGRAMS = \
  test_testing_topology_erdos_renyi \
  test_testing_topology_internat \
  test_testing_topology_none \
- test_testing_topology_scale_free
+ test_testing_topology_scale_free \
+ test_testing_new_portreservation \
+ test_testing_new_peerstartup \
+ test_testing_new_servicestartup
 
 if ENABLE_TEST_RUN 
 TESTS = \
@@ -78,9 +101,21 @@ TESTS = \
  test_testing_reconnect \
  test_testing_group \
  test_testing_peergroup \
- test_testing_topology_clique
+ test_testing_new_portreservation \
+ test_testing_new_peerstartup \
+ test_testing_new_servicestartup
 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 = \
@@ -172,6 +207,12 @@ 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 = \
@@ -228,12 +269,30 @@ test_testing_topology_none_LDADD = \
  $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
+test_testing_new_portreservation_SOURCES = \
+ test_testing_new_portreservation.c
+test_testing_new_portreservation_LDADD = \
+ $(top_builddir)/src/testing/libgnunettesting_new.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
+test_testing_new_peerstartup_SOURCES = \
+ test_testing_new_peerstartup.c
+test_testing_new_peerstartup_LDADD = \
+ $(top_builddir)/src/testing/libgnunettesting_new.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
+test_testing_new_servicestartup_SOURCES = \
+ test_testing_new_servicestartup.c
+test_testing_new_servicestartup_LDADD = \
+ $(top_builddir)/src/testing/libgnunettesting_new.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 \