- 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 dcefc34d1775ff764f5c199377e32c7a84c8b2db..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
@@ -18,42 +18,83 @@ lib_LTLIBRARIES = \
   libgnunettesting.la 
 
 libgnunettesting_la_SOURCES = \
-  testing_new.c  
+  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 0:1:0
+ -version-info 2:0:1
+
+bin_PROGRAMS = \
+ gnunet-testing
+
+noinst_PROGRAMS = \
+ list-keys
+
+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
+
+list_keys_SOURCES = \
+ list-keys.c
+list_keys_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(GN_LIBINTL)
 
 
 check_PROGRAMS = \
- test_testing_new_portreservation \
- test_testing_new_peerstartup \
- test_testing_new_servicestartup
+ 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_new_portreservation \
- test_testing_new_peerstartup \
- test_testing_new_servicestartup
+ test_testing_portreservation \
+ test_testing_peerstartup \
+ test_testing_peerstartup2 \
+ test_testing_servicestartup
 endif
 
-test_testing_new_portreservation_SOURCES = \
- test_testing_new_portreservation.c
-test_testing_new_portreservation_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_new_peerstartup_SOURCES = \
- test_testing_new_peerstartup.c
-test_testing_new_peerstartup_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_new_servicestartup_SOURCES = \
- test_testing_new_servicestartup.c
-test_testing_new_servicestartup_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_servicestartup_SOURCES = \
+ test_testing_servicestartup.c
+test_testing_servicestartup_LDADD = \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
+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_defaults.conf
+