consensus: destroy set handles

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

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 737726e3f2687fb2f1b50b333f27548767859cb0..df319fe7792b247755dd96091b1a9d311e6d6428 100644 (file)
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -31,6 +31,9 @@ endif
 
 if !MINGW
  SERVER_CLIENT_UNIX = test_server_with_client_unix
+ TEST_CLIENT_UNIC_NC = test_client_unix.nc
+else
+ TEST_CLIENT_UNIC_NC =
 endif
 
 if USE_COVERAGE
@@ -60,7 +63,6 @@ libgnunetutil_la_SOURCES = \
   bandwidth.c \
   bio.c \
   client.c \
-  client_manager.c \
   common_allocation.c \
   common_endian.c \
   common_logging.c \
@@ -71,6 +73,7 @@ libgnunetutil_la_SOURCES = \
   container_heap.c \
   container_meta_data.c \
   container_multihashmap.c \
+  container_multishortmap.c \
   container_multipeermap.c \
   container_multihashmap32.c \
   crypto_symmetric.c \
@@ -87,14 +90,16 @@ libgnunetutil_la_SOURCES = \
   crypto_random.c \
   crypto_rsa.c \
   disk.c \
-  disk_iterator.c \
   disk.h \
   getopt.c \
   getopt_helpers.c \
   helper.c \
   load.c \
+  mst.c \
   mq.c \
+  nc.c \
   network.c \
+  op.c \
   os_installation.c \
   os_network.c \
   os_priority.c \
@@ -108,6 +113,7 @@ libgnunetutil_la_SOURCES = \
   server_nc.c \
   server_tc.c \
   service.c \
+  service_new.c \
   signal.c \
   strings.c \
   time.c \
@@ -184,7 +190,7 @@ noinst_PROGRAMS = \
 
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS)
 endif
 
@@ -194,7 +200,7 @@ endif
 do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
 
 gnunet-qr: gnunet-qr.py.in Makefile
-       $(do_subst) < gnunet-qr.py.in > gnunet-qr
+       $(do_subst) < $(top_srcdir)/src/util/gnunet-qr.py.in > gnunet-qr
        chmod +x gnunet-qr
 
 gnunet_service_resolver_SOURCES = \
@@ -248,20 +254,29 @@ libgnunet_plugin_test_la_LDFLAGS = \
 if HAVE_BENCHMARKS
  BENCHMARKS = \
   perf_crypto_hash \
+  perf_crypto_ecc_dlog \
+  perf_crypto_rsa \
   perf_crypto_paillier \
   perf_crypto_symmetric \
   perf_crypto_asymmetric \
   perf_malloc
 endif
 
+if HAVE_SSH_KEY
+ SSH_USING_TESTS = test_socks.nc
+endif
+
 check_PROGRAMS = \
  test_bio \
  test_client.nc \
+ $(TEST_CLIENT_UNIX_NC) \
+ $(SSH_USING_TESTS) \
  test_common_allocation \
  test_common_endian \
  test_common_logging \
  test_configuration \
  test_container_bloomfilter \
+ test_container_dll \
  test_container_meta_data \
  test_container_multihashmap \
  test_container_multihashmap32 \
@@ -277,6 +292,7 @@ check_PROGRAMS = \
  test_crypto_hash \
  test_crypto_hash_context \
  test_crypto_hkdf \
+ test_crypto_kdf \
  test_crypto_paillier \
  test_crypto_random \
  test_crypto_rsa \
@@ -289,7 +305,6 @@ check_PROGRAMS = \
  test_connection_timeout_no_connect.nc \
  test_connection_transmit_cancel.nc \
  test_mq \
- test_mq_client.nc \
  test_os_network \
  test_peer \
  test_plugin \
@@ -321,12 +336,12 @@ test_connection_timeout_no_connect.log: test_connection_addressing.log
 test_connection_transmit_cancel.log: test_connection_timeout_no_connect.log
 test_connection_receive_cancel.log: test_connection_transmit_cancel.log
 test_connection_timeout.log: test_connection_receive_cancel.log
-test_mq_client.log: test_connection_timeout.log
-test_resolver_api.log: test_mq_client.log
+test_resolver_api.log: test_connection_timeout.log
 test_server.log: test_resolver_api.log
 test_server_disconnect.log: test_server.log
 test_server_with_client.log: test_server_disconnect.log
 test_server_mst_interrupt.log: test_server_with_client.log
+test_client_unix.log: test_server_mst_interrupt.log
 
 test_bio_SOURCES = \
  test_bio.c
@@ -347,6 +362,16 @@ test_client_nc_SOURCES = \
 test_client_nc_LDADD = \
  libgnunetutil.la
 
+test_client_unix_nc_SOURCES = \
+ test_client.c
+test_client_unix_nc_LDADD = \
+ libgnunetutil.la
+
+test_socks_nc_SOURCES = \
+ test_socks.c
+test_socks_nc_LDADD = \
+ libgnunetutil.la
+
 test_common_allocation_SOURCES = \
  test_common_allocation.c
 test_common_allocation_LDADD = \
@@ -377,10 +402,15 @@ test_container_bloomfilter_SOURCES = \
 test_container_bloomfilter_LDADD = \
  libgnunetutil.la
 
+test_container_dll_SOURCES = \
+ test_container_dll.c
+test_container_dll_LDADD = \
+ libgnunetutil.la
+
 test_container_meta_data_SOURCES = \
  test_container_meta_data.c
 test_container_meta_data_LDADD = \
- libgnunetutil.la -lextractor
+ libgnunetutil.la
 
 test_container_multihashmap_SOURCES = \
  test_container_multihashmap.c
@@ -457,6 +487,11 @@ test_crypto_hkdf_SOURCES = \
 test_crypto_hkdf_LDADD = \
  libgnunetutil.la
 
+test_crypto_kdf_SOURCES = \
+ test_crypto_kdf.c
+test_crypto_kdf_LDADD = \
+ libgnunetutil.la -lgcrypt
+
 test_crypto_paillier_SOURCES = \
  test_crypto_paillier.c
 test_crypto_paillier_LDADD = \
@@ -471,7 +506,7 @@ test_crypto_random_LDADD = \
 test_crypto_rsa_SOURCES = \
  test_crypto_rsa.c
 test_crypto_rsa_LDADD = \
- libgnunetutil.la
+ libgnunetutil.la -lgcrypt
 
 test_disk_SOURCES = \
  test_disk.c
@@ -518,11 +553,6 @@ test_mq_SOURCES = \
 test_mq_LDADD = \
  libgnunetutil.la
 
-test_mq_client_nc_SOURCES = \
- test_mq_client.c
-test_mq_client_nc_LDADD = \
- libgnunetutil.la
-
 test_os_network_SOURCES = \
  test_os_network.c
 test_os_network_LDADD = \
@@ -616,6 +646,17 @@ perf_crypto_hash_SOURCES = \
 perf_crypto_hash_LDADD = \
  libgnunetutil.la
 
+perf_crypto_ecc_dlog_SOURCES = \
+ perf_crypto_ecc_dlog.c
+perf_crypto_ecc_dlog_LDADD = \
+ libgnunetutil.la \
+ -lgcrypt
+
+perf_crypto_rsa_SOURCES = \
+ perf_crypto_rsa.c
+perf_crypto_rsa_LDADD = \
+ libgnunetutil.la
+
 perf_crypto_symmetric_SOURCES = \
  perf_crypto_symmetric.c
 perf_crypto_symmetric_LDADD = \
@@ -639,6 +680,8 @@ perf_malloc_LDADD = \
 
 
 EXTRA_DIST = \
+  test_client_data.conf \
+  test_client_unix.conf \
   test_configuration_data.conf \
   test_program_data.conf \
   test_resolver_api_data.conf \