[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r25629 - in gnunet: . src/ats src/consensus src/core src/da
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r25629 - in gnunet: . src/ats src/consensus src/core src/datacache src/datastore src/dht src/dns src/fs src/gns src/hello src/include src/lockmanager src/mesh src/namestore src/nat src/nse src/peerinfo src/pt src/regex src/stream src/testbed src/testing src/transport src/util |
|
Date: |
Fri, 21 Dec 2012 16:09:52 +0100 |
Author: grothoff
Date: 2012-12-21 16:09:51 +0100 (Fri, 21 Dec 2012)
New Revision: 25629
Added:
gnunet/src/include/gnunet_testing_lib.h
Removed:
gnunet/src/include/gnunet_testing_lib-new.h
Modified:
gnunet/configure.ac
gnunet/src/ats/Makefile.am
gnunet/src/ats/test_ats_api_bandwidth_consumption.c
gnunet/src/ats/test_ats_api_performance.c
gnunet/src/ats/test_ats_api_scheduling_add_address.c
gnunet/src/ats/test_ats_api_scheduling_add_session.c
gnunet/src/ats/test_ats_api_scheduling_block_and_reset.c
gnunet/src/ats/test_ats_api_scheduling_check_min_bw_alt.c
gnunet/src/ats/test_ats_api_scheduling_destroy_address.c
gnunet/src/ats/test_ats_api_scheduling_destroy_inbound_connection.c
gnunet/src/ats/test_ats_api_scheduling_destroy_session.c
gnunet/src/ats/test_ats_api_scheduling_init.c
gnunet/src/ats/test_ats_api_scheduling_min_bw.c
gnunet/src/ats/test_ats_api_scheduling_update_address.c
gnunet/src/ats/test_ats_simplistic.c
gnunet/src/ats/test_ats_simplistic_change_preference.c
gnunet/src/ats/test_ats_simplistic_switch_networks.c
gnunet/src/consensus/test_consensus_api.c
gnunet/src/core/test_core_api_send_to_self.c
gnunet/src/datacache/perf_datacache.c
gnunet/src/datacache/test_datacache.c
gnunet/src/datacache/test_datacache_quota.c
gnunet/src/datastore/perf_datastore_api.c
gnunet/src/datastore/perf_plugin_datastore.c
gnunet/src/datastore/test_datastore_api.c
gnunet/src/datastore/test_datastore_api_management.c
gnunet/src/datastore/test_plugin_datastore.c
gnunet/src/dht/Makefile.am
gnunet/src/dht/test_dht_api.c
gnunet/src/dns/Makefile.am
gnunet/src/fs/Makefile.am
gnunet/src/fs/test_fs_download.c
gnunet/src/fs/test_fs_download_persistence.c
gnunet/src/fs/test_fs_list_indexed.c
gnunet/src/fs/test_fs_namespace.c
gnunet/src/fs/test_fs_namespace_list_updateable.c
gnunet/src/fs/test_fs_publish.c
gnunet/src/fs/test_fs_publish_persistence.c
gnunet/src/fs/test_fs_search.c
gnunet/src/fs/test_fs_search_persistence.c
gnunet/src/fs/test_fs_search_probes.c
gnunet/src/fs/test_fs_start_stop.c
gnunet/src/fs/test_fs_unindex.c
gnunet/src/fs/test_fs_unindex_persistence.c
gnunet/src/gns/test_gns_cname_lookup.c
gnunet/src/gns/test_gns_dht_delegated_lookup.c
gnunet/src/gns/test_gns_dht_three_peers.c
gnunet/src/gns/test_gns_max_queries.c
gnunet/src/gns/test_gns_ns_lookup.c
gnunet/src/gns/test_gns_proxy.c
gnunet/src/gns/test_gns_pseu_shorten.c
gnunet/src/gns/test_gns_revocation.c
gnunet/src/gns/test_gns_simple_delegated_lookup.c
gnunet/src/gns/test_gns_simple_get_authority.c
gnunet/src/gns/test_gns_simple_lookup.c
gnunet/src/gns/test_gns_simple_mx_lookup.c
gnunet/src/gns/test_gns_simple_shorten.c
gnunet/src/gns/test_gns_simple_srv_lookup.c
gnunet/src/gns/test_gns_simple_zkey_lookup.c
gnunet/src/hello/Makefile.am
gnunet/src/include/Makefile.am
gnunet/src/include/gnunet_common.h
gnunet/src/include/gnunet_testbed_service.h
gnunet/src/lockmanager/test_lockmanager_api.c
gnunet/src/lockmanager/test_lockmanager_api_acquireretry.c
gnunet/src/lockmanager/test_lockmanager_api_lockrelease.c
gnunet/src/lockmanager/test_lockmanager_api_servercrash.c
gnunet/src/mesh/Makefile.am
gnunet/src/mesh/test_mesh_api.c
gnunet/src/mesh/test_mesh_local_1.c
gnunet/src/mesh/test_mesh_local_2.c
gnunet/src/mesh/test_mesh_local_traffic.c
gnunet/src/namestore/test_namestore_api.c
gnunet/src/namestore/test_namestore_api_create.c
gnunet/src/namestore/test_namestore_api_create_update.c
gnunet/src/namestore/test_namestore_api_lookup.c
gnunet/src/namestore/test_namestore_api_lookup_specific_type.c
gnunet/src/namestore/test_namestore_api_put.c
gnunet/src/namestore/test_namestore_api_remove.c
gnunet/src/namestore/test_namestore_api_remove_not_existing_record.c
gnunet/src/namestore/test_namestore_api_zone_iteration.c
gnunet/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
gnunet/src/namestore/test_namestore_api_zone_iteration_stop.c
gnunet/src/namestore/test_namestore_api_zone_to_name.c
gnunet/src/namestore/test_plugin_namestore.c
gnunet/src/nat/Makefile.am
gnunet/src/nse/test_nse_api.c
gnunet/src/peerinfo/perf_peerinfo_api.c
gnunet/src/peerinfo/test_peerinfo_api.c
gnunet/src/pt/test_gns_vpn.c
gnunet/src/pt/test_gnunet_vpn.c
gnunet/src/regex/Makefile.am
gnunet/src/stream/Makefile.am
gnunet/src/stream/test_stream_big.c
gnunet/src/stream/test_stream_local.c
gnunet/src/stream/test_stream_sequence_wraparound.c
gnunet/src/testbed/gnunet-helper-testbed.c
gnunet/src/testbed/gnunet-service-testbed.c
gnunet/src/testbed/test_testbed_api.c
gnunet/src/testbed/test_testbed_api_2peers_1controller.c
gnunet/src/testbed/test_testbed_api_3peers_3controllers.c
gnunet/src/testbed/test_testbed_api_controllerlink.c
gnunet/src/testing/Makefile.am
gnunet/src/testing/gnunet-testing-run-service.c
gnunet/src/testing/gnunet-testing.c
gnunet/src/testing/test_testing_peerstartup.c
gnunet/src/testing/test_testing_portreservation.c
gnunet/src/testing/test_testing_servicestartup.c
gnunet/src/testing/testing.c
gnunet/src/transport/Makefile.am
gnunet/src/transport/transport-testing.h
gnunet/src/util/Makefile.am
gnunet/src/util/gnunet-ecc.c
gnunet/src/util/gnunet-rsa.c
Log:
-renaming testing-new.h to testing.h, bumping library versions
Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2012-12-21 15:07:38 UTC (rev 25628)
+++ gnunet/configure.ac 2012-12-21 15:09:51 UTC (rev 25629)
@@ -22,13 +22,13 @@
#
AC_PREREQ(2.61)
# Checks for programs.
-AC_INIT([gnunet], [0.9.4],address@hidden)
+AC_INIT([gnunet], [0.9.5],address@hidden)
AC_CANONICAL_TARGET
AC_CANONICAL_HOST
AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE([gnunet], [0.9.4])
+AM_INIT_AUTOMAKE([gnunet], [0.9.5])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AC_CONFIG_HEADERS([gnunet_config.h])
AH_TOP([#define _GNU_SOURCE 1])
Modified: gnunet/src/ats/Makefile.am
===================================================================
--- gnunet/src/ats/Makefile.am 2012-12-21 15:07:38 UTC (rev 25628)
+++ gnunet/src/ats/Makefile.am 2012-12-21 15:09:51 UTC (rev 25629)
@@ -35,7 +35,7 @@
libgnunetats_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) \
- -version-info 3:0:3
+ -version-info 4:0:0
libexec_PROGRAMS = \
Modified: gnunet/src/ats/test_ats_api_bandwidth_consumption.c
===================================================================
--- gnunet/src/ats/test_ats_api_bandwidth_consumption.c 2012-12-21 15:07:38 UTC
(rev 25628)
+++ gnunet/src/ats/test_ats_api_bandwidth_consumption.c 2012-12-21 15:09:51 UTC
(rev 25629)
@@ -26,7 +26,7 @@
*/
#include "platform.h"
#include "gnunet_ats_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "ats.h"
#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
Modified: gnunet/src/ats/test_ats_api_performance.c
===================================================================
--- gnunet/src/ats/test_ats_api_performance.c 2012-12-21 15:07:38 UTC (rev
25628)
+++ gnunet/src/ats/test_ats_api_performance.c 2012-12-21 15:09:51 UTC (rev
25629)
@@ -25,7 +25,7 @@
*/
#include "platform.h"
#include "gnunet_ats_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "ats.h"
#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
Modified: gnunet/src/ats/test_ats_api_scheduling_add_address.c
===================================================================
--- gnunet/src/ats/test_ats_api_scheduling_add_address.c 2012-12-21
15:07:38 UTC (rev 25628)
+++ gnunet/src/ats/test_ats_api_scheduling_add_address.c 2012-12-21
15:09:51 UTC (rev 25629)
@@ -25,7 +25,7 @@
*/
#include "platform.h"
#include "gnunet_ats_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "ats.h"
#include "test_ats_api_common.h"
Modified: gnunet/src/ats/test_ats_api_scheduling_add_session.c
===================================================================
--- gnunet/src/ats/test_ats_api_scheduling_add_session.c 2012-12-21
15:07:38 UTC (rev 25628)
+++ gnunet/src/ats/test_ats_api_scheduling_add_session.c 2012-12-21
15:09:51 UTC (rev 25629)
@@ -25,7 +25,7 @@
*/
#include "platform.h"
#include "gnunet_ats_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "ats.h"
#include "test_ats_api_common.h"
Modified: gnunet/src/ats/test_ats_api_scheduling_block_and_reset.c
===================================================================
--- gnunet/src/ats/test_ats_api_scheduling_block_and_reset.c 2012-12-21
15:07:38 UTC (rev 25628)
+++ gnunet/src/ats/test_ats_api_scheduling_block_and_reset.c 2012-12-21
15:09:51 UTC (rev 25629)
@@ -27,7 +27,7 @@
*/
#include "platform.h"
#include "gnunet_ats_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "ats.h"
#include "test_ats_api_common.h"
Modified: gnunet/src/ats/test_ats_api_scheduling_check_min_bw_alt.c
===================================================================
--- gnunet/src/ats/test_ats_api_scheduling_check_min_bw_alt.c 2012-12-21
15:07:38 UTC (rev 25628)
+++ gnunet/src/ats/test_ats_api_scheduling_check_min_bw_alt.c 2012-12-21
15:09:51 UTC (rev 25629)
@@ -32,7 +32,7 @@
*/
#include "platform.h"
#include "gnunet_ats_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "ats.h"
#include "test_ats_api_common.h"
Modified: gnunet/src/ats/test_ats_api_scheduling_destroy_address.c
===================================================================
--- gnunet/src/ats/test_ats_api_scheduling_destroy_address.c 2012-12-21
15:07:38 UTC (rev 25628)
+++ gnunet/src/ats/test_ats_api_scheduling_destroy_address.c 2012-12-21
15:09:51 UTC (rev 25629)
@@ -26,7 +26,7 @@
*/
#include "platform.h"
#include "gnunet_ats_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "ats.h"
#include "test_ats_api_common.h"
Modified: gnunet/src/ats/test_ats_api_scheduling_destroy_inbound_connection.c
===================================================================
--- gnunet/src/ats/test_ats_api_scheduling_destroy_inbound_connection.c
2012-12-21 15:07:38 UTC (rev 25628)
+++ gnunet/src/ats/test_ats_api_scheduling_destroy_inbound_connection.c
2012-12-21 15:09:51 UTC (rev 25629)
@@ -29,7 +29,7 @@
*/
#include "platform.h"
#include "gnunet_ats_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "ats.h"
#include "test_ats_api_common.h"
Modified: gnunet/src/ats/test_ats_api_scheduling_destroy_session.c
===================================================================
--- gnunet/src/ats/test_ats_api_scheduling_destroy_session.c 2012-12-21
15:07:38 UTC (rev 25628)
+++ gnunet/src/ats/test_ats_api_scheduling_destroy_session.c 2012-12-21
15:09:51 UTC (rev 25629)
@@ -29,7 +29,7 @@
*/
#include "platform.h"
#include "gnunet_ats_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "ats.h"
#include "test_ats_api_common.h"
Modified: gnunet/src/ats/test_ats_api_scheduling_init.c
===================================================================
--- gnunet/src/ats/test_ats_api_scheduling_init.c 2012-12-21 15:07:38 UTC
(rev 25628)
+++ gnunet/src/ats/test_ats_api_scheduling_init.c 2012-12-21 15:09:51 UTC
(rev 25629)
@@ -26,7 +26,7 @@
*/
#include "platform.h"
#include "gnunet_ats_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "ats.h"
#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
Modified: gnunet/src/ats/test_ats_api_scheduling_min_bw.c
===================================================================
--- gnunet/src/ats/test_ats_api_scheduling_min_bw.c 2012-12-21 15:07:38 UTC
(rev 25628)
+++ gnunet/src/ats/test_ats_api_scheduling_min_bw.c 2012-12-21 15:09:51 UTC
(rev 25629)
@@ -25,7 +25,7 @@
*/
#include "platform.h"
#include "gnunet_ats_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "ats.h"
#include "test_ats_api_common.h"
Modified: gnunet/src/ats/test_ats_api_scheduling_update_address.c
===================================================================
--- gnunet/src/ats/test_ats_api_scheduling_update_address.c 2012-12-21
15:07:38 UTC (rev 25628)
+++ gnunet/src/ats/test_ats_api_scheduling_update_address.c 2012-12-21
15:09:51 UTC (rev 25629)
@@ -26,7 +26,7 @@
*/
#include "platform.h"
#include "gnunet_ats_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "ats.h"
#include "test_ats_api_common.h"
Modified: gnunet/src/ats/test_ats_simplistic.c
===================================================================
--- gnunet/src/ats/test_ats_simplistic.c 2012-12-21 15:07:38 UTC (rev
25628)
+++ gnunet/src/ats/test_ats_simplistic.c 2012-12-21 15:09:51 UTC (rev
25629)
@@ -32,7 +32,7 @@
*/
#include "platform.h"
#include "gnunet_ats_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "ats.h"
#include "test_ats_api_common.h"
Modified: gnunet/src/ats/test_ats_simplistic_change_preference.c
===================================================================
--- gnunet/src/ats/test_ats_simplistic_change_preference.c 2012-12-21
15:07:38 UTC (rev 25628)
+++ gnunet/src/ats/test_ats_simplistic_change_preference.c 2012-12-21
15:09:51 UTC (rev 25629)
@@ -32,7 +32,7 @@
*/
#include "platform.h"
#include "gnunet_ats_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "ats.h"
#include "test_ats_api_common.h"
Modified: gnunet/src/ats/test_ats_simplistic_switch_networks.c
===================================================================
--- gnunet/src/ats/test_ats_simplistic_switch_networks.c 2012-12-21
15:07:38 UTC (rev 25628)
+++ gnunet/src/ats/test_ats_simplistic_switch_networks.c 2012-12-21
15:09:51 UTC (rev 25629)
@@ -25,7 +25,7 @@
*/
#include "platform.h"
#include "gnunet_ats_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "ats.h"
#include "test_ats_api_common.h"
Modified: gnunet/src/consensus/test_consensus_api.c
===================================================================
--- gnunet/src/consensus/test_consensus_api.c 2012-12-21 15:07:38 UTC (rev
25628)
+++ gnunet/src/consensus/test_consensus_api.c 2012-12-21 15:09:51 UTC (rev
25629)
@@ -24,7 +24,7 @@
#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_consensus_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
static struct GNUNET_CONSENSUS_Handle *consensus1;
Modified: gnunet/src/core/test_core_api_send_to_self.c
===================================================================
--- gnunet/src/core/test_core_api_send_to_self.c 2012-12-21 15:07:38 UTC
(rev 25628)
+++ gnunet/src/core/test_core_api_send_to_self.c 2012-12-21 15:09:51 UTC
(rev 25629)
@@ -25,7 +25,7 @@
*/
#include "platform.h"
#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "gnunet_protocols.h"
#include "gnunet_core_service.h"
#include "gnunet_constants.h"
Modified: gnunet/src/datacache/perf_datacache.c
===================================================================
--- gnunet/src/datacache/perf_datacache.c 2012-12-21 15:07:38 UTC (rev
25628)
+++ gnunet/src/datacache/perf_datacache.c 2012-12-21 15:09:51 UTC (rev
25629)
@@ -25,7 +25,7 @@
#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_datacache_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include <gauger.h>
Modified: gnunet/src/datacache/test_datacache.c
===================================================================
--- gnunet/src/datacache/test_datacache.c 2012-12-21 15:07:38 UTC (rev
25628)
+++ gnunet/src/datacache/test_datacache.c 2012-12-21 15:09:51 UTC (rev
25629)
@@ -25,7 +25,7 @@
#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_datacache_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#define ASSERT(x) do { if (! (x)) { printf("Error at %s:%d\n", __FILE__,
__LINE__); goto FAILURE;} } while (0)
Modified: gnunet/src/datacache/test_datacache_quota.c
===================================================================
--- gnunet/src/datacache/test_datacache_quota.c 2012-12-21 15:07:38 UTC (rev
25628)
+++ gnunet/src/datacache/test_datacache_quota.c 2012-12-21 15:09:51 UTC (rev
25629)
@@ -25,7 +25,7 @@
#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_datacache_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#define ASSERT(x) do { if (! (x)) { printf("Error at %s:%d\n", __FILE__,
__LINE__); goto FAILURE;} } while (0)
Modified: gnunet/src/datastore/perf_datastore_api.c
===================================================================
--- gnunet/src/datastore/perf_datastore_api.c 2012-12-21 15:07:38 UTC (rev
25628)
+++ gnunet/src/datastore/perf_datastore_api.c 2012-12-21 15:09:51 UTC (rev
25629)
@@ -36,7 +36,7 @@
#include "gnunet_util_lib.h"
#include "gnunet_protocols.h"
#include "gnunet_datastore_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include <gauger.h>
/**
Modified: gnunet/src/datastore/perf_plugin_datastore.c
===================================================================
--- gnunet/src/datastore/perf_plugin_datastore.c 2012-12-21 15:07:38 UTC
(rev 25628)
+++ gnunet/src/datastore/perf_plugin_datastore.c 2012-12-21 15:09:51 UTC
(rev 25629)
@@ -27,7 +27,7 @@
#include "gnunet_util_lib.h"
#include "gnunet_protocols.h"
#include "gnunet_datastore_plugin.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include <gauger.h>
/**
Modified: gnunet/src/datastore/test_datastore_api.c
===================================================================
--- gnunet/src/datastore/test_datastore_api.c 2012-12-21 15:07:38 UTC (rev
25628)
+++ gnunet/src/datastore/test_datastore_api.c 2012-12-21 15:09:51 UTC (rev
25629)
@@ -30,7 +30,7 @@
#include "gnunet_util_lib.h"
#include "gnunet_protocols.h"
#include "gnunet_datastore_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
/**
Modified: gnunet/src/datastore/test_datastore_api_management.c
===================================================================
--- gnunet/src/datastore/test_datastore_api_management.c 2012-12-21
15:07:38 UTC (rev 25628)
+++ gnunet/src/datastore/test_datastore_api_management.c 2012-12-21
15:09:51 UTC (rev 25629)
@@ -26,7 +26,7 @@
#include "gnunet_util_lib.h"
#include "gnunet_protocols.h"
#include "gnunet_datastore_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
/**
Modified: gnunet/src/datastore/test_plugin_datastore.c
===================================================================
--- gnunet/src/datastore/test_plugin_datastore.c 2012-12-21 15:07:38 UTC
(rev 25628)
+++ gnunet/src/datastore/test_plugin_datastore.c 2012-12-21 15:09:51 UTC
(rev 25629)
@@ -27,7 +27,7 @@
#include "gnunet_util_lib.h"
#include "gnunet_protocols.h"
#include "gnunet_datastore_plugin.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
/**
* Number of put operations to perform.
Modified: gnunet/src/dht/Makefile.am
===================================================================
--- gnunet/src/dht/Makefile.am 2012-12-21 15:07:38 UTC (rev 25628)
+++ gnunet/src/dht/Makefile.am 2012-12-21 15:09:51 UTC (rev 25629)
@@ -32,7 +32,7 @@
$(LTLIBINTL)
libgnunetdht_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) $(WINFLAGS) \
- -version-info 1:1:1
+ -version-info 2:0:2
plugin_LTLIBRARIES = \
Modified: gnunet/src/dht/test_dht_api.c
===================================================================
--- gnunet/src/dht/test_dht_api.c 2012-12-21 15:07:38 UTC (rev 25628)
+++ gnunet/src/dht/test_dht_api.c 2012-12-21 15:09:51 UTC (rev 25629)
@@ -27,7 +27,7 @@
#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_hello_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "gnunet_dht_service.h"
Modified: gnunet/src/dns/Makefile.am
===================================================================
--- gnunet/src/dns/Makefile.am 2012-12-21 15:07:38 UTC (rev 25628)
+++ gnunet/src/dns/Makefile.am 2012-12-21 15:09:51 UTC (rev 25629)
@@ -89,7 +89,7 @@
-lidn
libgnunetdnsparser_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) \
- -version-info 0:0:0
+ -version-info 1:0:1
libgnunetdnsstub_la_SOURCES = \
dnsstub.c
Modified: gnunet/src/fs/Makefile.am
===================================================================
--- gnunet/src/fs/Makefile.am 2012-12-21 15:07:38 UTC (rev 25628)
+++ gnunet/src/fs/Makefile.am 2012-12-21 15:09:51 UTC (rev 25629)
@@ -52,7 +52,7 @@
libgnunetfs_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) $(WINFLAGS) \
- -version-info 2:2:0
+ -version-info 3:0:1
libgnunetfstest_a_SOURCES = \
Modified: gnunet/src/fs/test_fs_download.c
===================================================================
--- gnunet/src/fs/test_fs_download.c 2012-12-21 15:07:38 UTC (rev 25628)
+++ gnunet/src/fs/test_fs_download.c 2012-12-21 15:09:51 UTC (rev 25629)
@@ -27,7 +27,7 @@
#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_fs_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include <gauger.h>
/**
Modified: gnunet/src/fs/test_fs_download_persistence.c
===================================================================
--- gnunet/src/fs/test_fs_download_persistence.c 2012-12-21 15:07:38 UTC
(rev 25628)
+++ gnunet/src/fs/test_fs_download_persistence.c 2012-12-21 15:09:51 UTC
(rev 25629)
@@ -25,7 +25,7 @@
*/
#include "platform.h"
#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "gnunet_fs_service.h"
/**
Modified: gnunet/src/fs/test_fs_list_indexed.c
===================================================================
--- gnunet/src/fs/test_fs_list_indexed.c 2012-12-21 15:07:38 UTC (rev
25628)
+++ gnunet/src/fs/test_fs_list_indexed.c 2012-12-21 15:09:51 UTC (rev
25629)
@@ -29,7 +29,7 @@
*/
#include "platform.h"
#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "gnunet_fs_service.h"
/**
Modified: gnunet/src/fs/test_fs_namespace.c
===================================================================
--- gnunet/src/fs/test_fs_namespace.c 2012-12-21 15:07:38 UTC (rev 25628)
+++ gnunet/src/fs/test_fs_namespace.c 2012-12-21 15:09:51 UTC (rev 25629)
@@ -25,7 +25,7 @@
*/
#include "platform.h"
#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "gnunet_fs_service.h"
Modified: gnunet/src/fs/test_fs_namespace_list_updateable.c
===================================================================
--- gnunet/src/fs/test_fs_namespace_list_updateable.c 2012-12-21 15:07:38 UTC
(rev 25628)
+++ gnunet/src/fs/test_fs_namespace_list_updateable.c 2012-12-21 15:09:51 UTC
(rev 25629)
@@ -25,7 +25,7 @@
*/
#include "platform.h"
#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "gnunet_fs_service.h"
Modified: gnunet/src/fs/test_fs_publish.c
===================================================================
--- gnunet/src/fs/test_fs_publish.c 2012-12-21 15:07:38 UTC (rev 25628)
+++ gnunet/src/fs/test_fs_publish.c 2012-12-21 15:09:51 UTC (rev 25629)
@@ -25,7 +25,7 @@
*/
#include "platform.h"
#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "gnunet_fs_service.h"
/**
Modified: gnunet/src/fs/test_fs_publish_persistence.c
===================================================================
--- gnunet/src/fs/test_fs_publish_persistence.c 2012-12-21 15:07:38 UTC (rev
25628)
+++ gnunet/src/fs/test_fs_publish_persistence.c 2012-12-21 15:09:51 UTC (rev
25629)
@@ -24,7 +24,7 @@
*/
#include "platform.h"
#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "gnunet_fs_service.h"
Modified: gnunet/src/fs/test_fs_search.c
===================================================================
--- gnunet/src/fs/test_fs_search.c 2012-12-21 15:07:38 UTC (rev 25628)
+++ gnunet/src/fs/test_fs_search.c 2012-12-21 15:09:51 UTC (rev 25629)
@@ -24,7 +24,7 @@
*/
#include "platform.h"
#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "gnunet_fs_service.h"
Modified: gnunet/src/fs/test_fs_search_persistence.c
===================================================================
--- gnunet/src/fs/test_fs_search_persistence.c 2012-12-21 15:07:38 UTC (rev
25628)
+++ gnunet/src/fs/test_fs_search_persistence.c 2012-12-21 15:09:51 UTC (rev
25629)
@@ -24,7 +24,7 @@
*/
#include "platform.h"
#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "gnunet_fs_service.h"
Modified: gnunet/src/fs/test_fs_search_probes.c
===================================================================
--- gnunet/src/fs/test_fs_search_probes.c 2012-12-21 15:07:38 UTC (rev
25628)
+++ gnunet/src/fs/test_fs_search_probes.c 2012-12-21 15:09:51 UTC (rev
25629)
@@ -25,7 +25,7 @@
*/
#include "platform.h"
#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "gnunet_fs_service.h"
Modified: gnunet/src/fs/test_fs_start_stop.c
===================================================================
--- gnunet/src/fs/test_fs_start_stop.c 2012-12-21 15:07:38 UTC (rev 25628)
+++ gnunet/src/fs/test_fs_start_stop.c 2012-12-21 15:09:51 UTC (rev 25629)
@@ -25,7 +25,7 @@
#include "platform.h"
#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "gnunet_fs_service.h"
Modified: gnunet/src/fs/test_fs_unindex.c
===================================================================
--- gnunet/src/fs/test_fs_unindex.c 2012-12-21 15:07:38 UTC (rev 25628)
+++ gnunet/src/fs/test_fs_unindex.c 2012-12-21 15:09:51 UTC (rev 25629)
@@ -26,7 +26,7 @@
#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_fs_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
/**
Modified: gnunet/src/fs/test_fs_unindex_persistence.c
===================================================================
--- gnunet/src/fs/test_fs_unindex_persistence.c 2012-12-21 15:07:38 UTC (rev
25628)
+++ gnunet/src/fs/test_fs_unindex_persistence.c 2012-12-21 15:09:51 UTC (rev
25629)
@@ -25,7 +25,7 @@
*/
#include "platform.h"
#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "gnunet_fs_service.h"
/**
Modified: gnunet/src/gns/test_gns_cname_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_cname_lookup.c 2012-12-21 15:07:38 UTC (rev
25628)
+++ gnunet/src/gns/test_gns_cname_lookup.c 2012-12-21 15:09:51 UTC (rev
25629)
@@ -23,7 +23,7 @@
* @author Martin Schanzenbach
*/
#include "platform.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "gnunet_core_service.h"
#include "block_dns.h"
#include "gnunet_signatures.h"
Modified: gnunet/src/gns/test_gns_dht_delegated_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_dht_delegated_lookup.c 2012-12-21 15:07:38 UTC
(rev 25628)
+++ gnunet/src/gns/test_gns_dht_delegated_lookup.c 2012-12-21 15:09:51 UTC
(rev 25629)
@@ -23,7 +23,7 @@
*
*/
#include "platform.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "gnunet_core_service.h"
#include "block_gns.h"
#include "gnunet_signatures.h"
Modified: gnunet/src/gns/test_gns_dht_three_peers.c
===================================================================
--- gnunet/src/gns/test_gns_dht_three_peers.c 2012-12-21 15:07:38 UTC (rev
25628)
+++ gnunet/src/gns/test_gns_dht_three_peers.c 2012-12-21 15:09:51 UTC (rev
25629)
@@ -30,7 +30,7 @@
#include "platform.h"
#include "gnunet_common.h"
#include "gnunet_disk_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "gnunet_testbed_service.h"
#include "gnunet_core_service.h"
#include "gnunet_dht_service.h"
Modified: gnunet/src/gns/test_gns_max_queries.c
===================================================================
--- gnunet/src/gns/test_gns_max_queries.c 2012-12-21 15:07:38 UTC (rev
25628)
+++ gnunet/src/gns/test_gns_max_queries.c 2012-12-21 15:09:51 UTC (rev
25629)
@@ -23,7 +23,7 @@
* in particular query replacement and clean shutdown
*/
#include "platform.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "gnunet_core_service.h"
#include "block_dns.h"
#include "gns.h"
Modified: gnunet/src/gns/test_gns_ns_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_ns_lookup.c 2012-12-21 15:07:38 UTC (rev 25628)
+++ gnunet/src/gns/test_gns_ns_lookup.c 2012-12-21 15:09:51 UTC (rev 25629)
@@ -23,7 +23,7 @@
* @author Martin Schanzenbach
*/
#include "platform.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "gnunet_core_service.h"
#include "block_dns.h"
#include "gnunet_signatures.h"
Modified: gnunet/src/gns/test_gns_proxy.c
===================================================================
--- gnunet/src/gns/test_gns_proxy.c 2012-12-21 15:07:38 UTC (rev 25628)
+++ gnunet/src/gns/test_gns_proxy.c 2012-12-21 15:09:51 UTC (rev 25629)
@@ -28,7 +28,7 @@
#include <microhttpd.h>
#include "gnunet_namestore_service.h"
#include "gnunet_gns_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "gnunet_os_lib.h"
#define PORT 8080
Modified: gnunet/src/gns/test_gns_pseu_shorten.c
===================================================================
--- gnunet/src/gns/test_gns_pseu_shorten.c 2012-12-21 15:07:38 UTC (rev
25628)
+++ gnunet/src/gns/test_gns_pseu_shorten.c 2012-12-21 15:09:51 UTC (rev
25629)
@@ -23,7 +23,7 @@
*
*/
#include "platform.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "gnunet_core_service.h"
#include "block_gns.h"
#include "gnunet_signatures.h"
Modified: gnunet/src/gns/test_gns_revocation.c
===================================================================
--- gnunet/src/gns/test_gns_revocation.c 2012-12-21 15:07:38 UTC (rev
25628)
+++ gnunet/src/gns/test_gns_revocation.c 2012-12-21 15:09:51 UTC (rev
25629)
@@ -23,7 +23,7 @@
*
*/
#include "platform.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "gnunet_core_service.h"
#include "block_dns.h"
#include "gnunet_signatures.h"
Modified: gnunet/src/gns/test_gns_simple_delegated_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_simple_delegated_lookup.c 2012-12-21 15:07:38 UTC
(rev 25628)
+++ gnunet/src/gns/test_gns_simple_delegated_lookup.c 2012-12-21 15:09:51 UTC
(rev 25629)
@@ -37,7 +37,7 @@
* the peers.
*/
#include "platform.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "gnunet_core_service.h"
#include "block_dns.h"
#include "gnunet_signatures.h"
Modified: gnunet/src/gns/test_gns_simple_get_authority.c
===================================================================
--- gnunet/src/gns/test_gns_simple_get_authority.c 2012-12-21 15:07:38 UTC
(rev 25628)
+++ gnunet/src/gns/test_gns_simple_get_authority.c 2012-12-21 15:09:51 UTC
(rev 25629)
@@ -23,7 +23,7 @@
*
*/
#include "platform.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "gnunet_core_service.h"
#include "block_dns.h"
#include "gnunet_signatures.h"
Modified: gnunet/src/gns/test_gns_simple_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_simple_lookup.c 2012-12-21 15:07:38 UTC (rev
25628)
+++ gnunet/src/gns/test_gns_simple_lookup.c 2012-12-21 15:09:51 UTC (rev
25629)
@@ -23,7 +23,7 @@
* @author Martin Schanzenbach
*/
#include "platform.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "gnunet_core_service.h"
#include "block_dns.h"
#include "gnunet_signatures.h"
Modified: gnunet/src/gns/test_gns_simple_mx_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_simple_mx_lookup.c 2012-12-21 15:07:38 UTC (rev
25628)
+++ gnunet/src/gns/test_gns_simple_mx_lookup.c 2012-12-21 15:09:51 UTC (rev
25629)
@@ -23,7 +23,7 @@
*
*/
#include "platform.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "gnunet_core_service.h"
#include "block_dns.h"
#include "gnunet_signatures.h"
Modified: gnunet/src/gns/test_gns_simple_shorten.c
===================================================================
--- gnunet/src/gns/test_gns_simple_shorten.c 2012-12-21 15:07:38 UTC (rev
25628)
+++ gnunet/src/gns/test_gns_simple_shorten.c 2012-12-21 15:09:51 UTC (rev
25629)
@@ -23,7 +23,7 @@
*
*/
#include "platform.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "gnunet_core_service.h"
#include "block_dns.h"
#include "gnunet_signatures.h"
Modified: gnunet/src/gns/test_gns_simple_srv_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_simple_srv_lookup.c 2012-12-21 15:07:38 UTC (rev
25628)
+++ gnunet/src/gns/test_gns_simple_srv_lookup.c 2012-12-21 15:09:51 UTC (rev
25629)
@@ -23,7 +23,7 @@
*
*/
#include "platform.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "gnunet_core_service.h"
#include "block_dns.h"
#include "gnunet_signatures.h"
Modified: gnunet/src/gns/test_gns_simple_zkey_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_simple_zkey_lookup.c 2012-12-21 15:07:38 UTC
(rev 25628)
+++ gnunet/src/gns/test_gns_simple_zkey_lookup.c 2012-12-21 15:09:51 UTC
(rev 25629)
@@ -23,7 +23,7 @@
*
*/
#include "platform.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "gnunet_core_service.h"
#include "block_dns.h"
#include "gnunet_signatures.h"
Modified: gnunet/src/hello/Makefile.am
===================================================================
--- gnunet/src/hello/Makefile.am 2012-12-21 15:07:38 UTC (rev 25628)
+++ gnunet/src/hello/Makefile.am 2012-12-21 15:09:51 UTC (rev 25629)
@@ -18,7 +18,7 @@
$(LTLIBINTL)
libgnunethello_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) \
- -version-info 0:0:0
+ -version-info 1:0:1
noinst_PROGRAMS = \
gnunet-hello
Modified: gnunet/src/include/Makefile.am
===================================================================
--- gnunet/src/include/Makefile.am 2012-12-21 15:07:38 UTC (rev 25628)
+++ gnunet/src/include/Makefile.am 2012-12-21 15:09:51 UTC (rev 25629)
@@ -80,7 +80,6 @@
gnunet_strings_lib.h \
gnunet_testbed_service.h \
gnunet_testing_lib.h \
- gnunet_testing_lib-new.h \
gnunet_time_lib.h \
gnunet_transport_service.h \
gnunet_transport_plugin.h \
Modified: gnunet/src/include/gnunet_common.h
===================================================================
--- gnunet/src/include/gnunet_common.h 2012-12-21 15:07:38 UTC (rev 25628)
+++ gnunet/src/include/gnunet_common.h 2012-12-21 15:09:51 UTC (rev 25629)
@@ -57,7 +57,7 @@
/**
* Version of the API (for entire gnunetutil.so library).
*/
-#define GNUNET_UTIL_VERSION 0x00090400
+#define GNUNET_UTIL_VERSION 0x00090500
/**
* Named constants for return values. The following
Modified: gnunet/src/include/gnunet_testbed_service.h
===================================================================
--- gnunet/src/include/gnunet_testbed_service.h 2012-12-21 15:07:38 UTC (rev
25628)
+++ gnunet/src/include/gnunet_testbed_service.h 2012-12-21 15:09:51 UTC (rev
25629)
@@ -29,7 +29,7 @@
#define GNUNET_TESTBED_SERVICE_H
#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#ifdef __cplusplus
extern "C"
Deleted: gnunet/src/include/gnunet_testing_lib-new.h
===================================================================
--- gnunet/src/include/gnunet_testing_lib-new.h 2012-12-21 15:07:38 UTC (rev
25628)
+++ gnunet/src/include/gnunet_testing_lib-new.h 2012-12-21 15:09:51 UTC (rev
25629)
@@ -1,372 +0,0 @@
-/*
- This file is part of GNUnet
- (C) 2008, 2009, 2012 Christian Grothoff (and other contributing authors)
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
- */
-
-/**
- * @file include/gnunet_testing_lib-new.h
- * @brief convenience API for writing testcases for GNUnet;
- * can start/stop one or more peers on a system;
- * testing is responsible for managing private keys,
- * ports and paths; it is a low-level library that
- * does not support higher-level functions such as
- * P2P connection, topology management or distributed
- * testbed maintenance (those are in gnunet_testbed_service.h)
- * @author Christian Grothoff
- */
-
-#ifndef GNUNET_TESTING_LIB_NEW_H
-#define GNUNET_TESTING_LIB_NEW_H
-
-#include "gnunet_util_lib.h"
-#include "gnunet_statistics_service.h"
-
-#ifdef __cplusplus
-extern "C"
-{
-#if 0 /* keep Emacsens' auto-indent happy */
-}
-#endif
-#endif
-
-#define GNUNET_TESTING_HOSTKEYFILESIZE 914
-
-/**
- * Handle for a system on which GNUnet peers are executed;
- * a system is used for reserving unique paths and ports.
- */
-struct GNUNET_TESTING_System;
-
-
-/**
- * Handle for a GNUnet peer controlled by testing.
- */
-struct GNUNET_TESTING_Peer;
-
-
-/**
- * Create a system handle. There must only be one system handle per operating
- * system. Uses a default range for allowed ports. Ports are still tested for
- * availability.
- *
- * @param testdir only the directory name without any path. This is used for
all
- * service homes; the directory will be created in a temporary
location
- * depending on the underlying OS
- * @param trusted_ip the ip address which will be set as TRUSTED HOST in all
- * service configurations generated to allow control connections from
- * this ip. This can either be a single ip address or a network
address
- * in CIDR notation.
- * @param hostname the hostname of the system we are using for testing; NULL
for
- * localhost
- * @return handle to this system, NULL on error
- */
-struct GNUNET_TESTING_System *
-GNUNET_TESTING_system_create (const char *testdir,
- const char *trusted_ip,
- const char *hostname);
-
-
-/**
- * Create a system handle. There must only be one system
- * handle per operating system. Use this function directly
- * if multiple system objects are created for the same host
- * (only really useful when testing --- or to make the port
- * range configureable).
- *
- * @param testdir only the directory name without any path. This is used for
- * all service homes; the directory will be created in a temporary
- * location depending on the underlying OS
- * @param trusted_ip the ip address which will be set as TRUSTED HOST in all
- * service configurations generated to allow control connections from
- * this ip. This can either be a single ip address or a network
address
- * in CIDR notation.
- * @param controller hostname of the controlling host,
- * service configurations are modified to allow
- * control connections from this host; can be NULL
- * @param hostname the hostname of the system we are using for testing; NULL
for
- * localhost
- * @param lowport lowest port number this system is allowed to allocate
(inclusive)
- * @param highport highest port number this system is allowed to allocate
(exclusive)
- * @return handle to this system, NULL on error
- */
-struct GNUNET_TESTING_System *
-GNUNET_TESTING_system_create_with_portrange (const char *testdir,
- const char *trusted_ip,
- const char *hostname,
- uint16_t lowport,
- uint16_t highport);
-
-
-/**
- * Free system resources.
- *
- * @param system system to be freed
- * @param remove_paths should the 'testdir' and all subdirectories
- * be removed (clean up on shutdown)?
- */
-void
-GNUNET_TESTING_system_destroy (struct GNUNET_TESTING_System *system,
- int remove_paths);
-
-
-/**
- * Testing includes a number of pre-created hostkeys for
- * faster peer startup. This function can be used to
- * access the n-th key of those pre-created hostkeys; note
- * that these keys are ONLY useful for testing and not
- * secure as the private keys are part of the public
- * GNUnet source code.
- *
- * This is primarily a helper function used internally
- * by 'GNUNET_TESTING_peer_configure'.
- *
- * @param system the testing system handle
- * @param key_number desired pre-created hostkey to obtain
- * @param id set to the peer's identity (hash of the public
- * key; if NULL, GNUNET_SYSERR is returned immediately
- * @return NULL on error (not enough keys)
- */
-struct GNUNET_CRYPTO_RsaPrivateKey *
-GNUNET_TESTING_hostkey_get (const struct GNUNET_TESTING_System *system,
- uint32_t key_number,
- struct GNUNET_PeerIdentity *id);
-
-
-/**
- * Reserve a TCP or UDP port for a peer.
- *
- * @param system system to use for reservation tracking
- * @param is_tcp GNUNET_YES for TCP ports, GNUNET_NO for UDP
- * @return 0 if no free port was available
- */
-uint16_t
-GNUNET_TESTING_reserve_port (struct GNUNET_TESTING_System *system,
- int is_tcp);
-
-
-/**
- * Release reservation of a TCP or UDP port for a peer
- * (used during GNUNET_TESTING_peer_destroy).
- *
- * @param system system to use for reservation tracking
- * @param is_tcp GNUNET_YES for TCP ports, GNUNET_NO for UDP
- * @param port reserved port to release
- */
-void
-GNUNET_TESTING_release_port (struct GNUNET_TESTING_System *system,
- int is_tcp,
- uint16_t port);
-
-
-/**
- * Create a new configuration using the given configuration as a template;
- * ports and paths will be modified to select available ports on the local
- * system. The default configuration will be available in PATHS section under
- * the option DEFAULTCONFIG after the call. SERVICE_HOME is also set in PATHS
- * section to the temporary directory specific to this configuration. If we run
- * out of "*port" numbers, return SYSERR.
- *
- * This is primarily a helper function used internally
- * by 'GNUNET_TESTING_peer_configure'.
- *
- * @param system system to use to coordinate resource usage
- * @param cfg template configuration to update
- * @return GNUNET_OK on success, GNUNET_SYSERR on error - the configuration
will
- * be incomplete and should not be used there upon
- */
-int
-GNUNET_TESTING_configuration_create (struct GNUNET_TESTING_System *system,
- struct GNUNET_CONFIGURATION_Handle *cfg);
-// FIXME: add dual to 'release' ports again...
-
-
-/**
- * Configure a GNUnet peer. GNUnet must be installed on the local
- * system and available in the PATH.
- *
- * @param system system to use to coordinate resource usage
- * @param cfg configuration to use; will be UPDATED (to reflect needed
- * changes in port numbers and paths)
- * @param key_number number of the hostkey to use for the peer
- * @param id identifier for the daemon, will be set, can be NULL
- * @param emsg set to freshly allocated error message (set to NULL on
success),
- * can be NULL
- * @return handle to the peer, NULL on error
- */
-struct GNUNET_TESTING_Peer *
-GNUNET_TESTING_peer_configure (struct GNUNET_TESTING_System *system,
- struct GNUNET_CONFIGURATION_Handle *cfg,
- uint32_t key_number,
- struct GNUNET_PeerIdentity *id,
- char **emsg);
-
-
-/**
- * Obtain the peer identity from a peer handle.
- *
- * @param peer peer handle for which we want the peer's identity
- * @param id identifier for the daemon, will be set
- */
-void
-GNUNET_TESTING_peer_get_identity (const struct GNUNET_TESTING_Peer *peer,
- struct GNUNET_PeerIdentity *id);
-
-
-/**
- * Start the peer.
- *
- * @param peer peer to start
- * @return GNUNET_OK on success, GNUNET_SYSERR on error (i.e. peer already
running)
- */
-int
-GNUNET_TESTING_peer_start (struct GNUNET_TESTING_Peer *peer);
-
-
-/**
- * Stop the peer.
- *
- * @param peer peer to stop
- * @return GNUNET_OK on success, GNUNET_SYSERR on error (i.e. peer not running)
- */
-int
-GNUNET_TESTING_peer_stop (struct GNUNET_TESTING_Peer *peer);
-
-
-/**
- * Destroy the peer. Releases resources locked during peer configuration.
- * If the peer is still running, it will be stopped AND a warning will be
- * printed (users of the API should stop the peer explicitly first).
- *
- * @param peer peer to destroy
- */
-void
-GNUNET_TESTING_peer_destroy (struct GNUNET_TESTING_Peer *peer);
-
-
-/**
- * Sends SIGTERM to the peer's main process
- *
- * @param peer the handle to the peer
- * @return GNUNET_OK if successful; GNUNET_SYSERR if the main process is NULL
- * or upon any error while sending SIGTERM
- */
-int
-GNUNET_TESTING_peer_kill (struct GNUNET_TESTING_Peer *peer);
-
-
-/**
- * Waits for a peer to terminate. The peer's main process will also be
destroyed.
- *
- * @param peer the handle to the peer
- * @return GNUNET_OK if successful; GNUNET_SYSERR if the main process is NULL
- * or upon any error while waiting
- */
-int
-GNUNET_TESTING_peer_wait (struct GNUNET_TESTING_Peer *peer);
-
-
-/**
- * Signature of the 'main' function for a (single-peer) testcase that
- * is run using 'GNUNET_TESTING_peer_run'.
- *
- * @param cls closure
- * @param cfg configuration of the peer that was started
- * @param peer identity of the peer that was created
- */
-typedef void (*GNUNET_TESTING_TestMain)(void *cls,
- const struct
GNUNET_CONFIGURATION_Handle *cfg,
- struct GNUNET_TESTING_Peer *peer);
-
-
-/**
- * Start a single peer and run a test using the testing library.
- * Starts a peer using the given configuration and then invokes the
- * given callback. This function ALSO initializes the scheduler loop
- * and should thus be called directly from "main". The testcase
- * should self-terminate by invoking 'GNUNET_SCHEDULER_shutdown'.
- *
- * @param testdir only the directory name without any path. This is used for
- * all service homes; the directory will be created in a temporary
- * location depending on the underlying OS
- * @param cfgfilename name of the configuration file to use;
- * use NULL to only run with defaults
- * @param tm main function of the testcase
- * @param tm_cls closure for 'tm'
- * @return 0 on success, 1 on error
- */
-int
-GNUNET_TESTING_peer_run (const char *testdir,
- const char *cfgfilename,
- GNUNET_TESTING_TestMain tm,
- void *tm_cls);
-
-
-/**
- * Start a single service (no ARM, except of course if the given
- * service name is 'arm') and run a test using the testing library.
- * Starts a service using the given configuration and then invokes the
- * given callback. This function ALSO initializes the scheduler loop
- * and should thus be called directly from "main". The testcase
- * should self-terminate by invoking 'GNUNET_SCHEDULER_shutdown'.
- *
- * This function is useful if the testcase is for a single service
- * and if that service doesn't itself depend on other services.
- *
- * @param testdir only the directory name without any path. This is used for
- * all service homes; the directory will be created in a temporary
- * location depending on the underlying OS
- * @param service_name name of the service to run
- * @param cfgfilename name of the configuration file to use;
- * use NULL to only run with defaults
- * @param tm main function of the testcase
- * @param tm_cls closure for 'tm'
- * @return 0 on success, 1 on error
- */
-int
-GNUNET_TESTING_service_run (const char *testdir,
- const char *service_name,
- const char *cfgfilename,
- GNUNET_TESTING_TestMain tm,
- void *tm_cls);
-
-
-/**
- * Sometimes we use the binary name to determine which specific
- * test to run. In those cases, the string after the last "_"
- * in 'argv[0]' specifies a string that determines the configuration
- * file or plugin to use.
- *
- * This function returns the respective substring, taking care
- * of issues such as binaries ending in '.exe' on W32.
- *
- * @param argv0 the name of the binary
- * @return string between the last '_' and the '.exe' (or the end of the
string),
- * NULL if argv0 has no '_'
- */
-char *
-GNUNET_TESTING_get_testname_from_underscore (const char *argv0);
-
-
-#if 0 /* keep Emacsens' auto-indent happy */
-{
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-#endif
Copied: gnunet/src/include/gnunet_testing_lib.h (from rev 25627,
gnunet/src/include/gnunet_testing_lib-new.h)
===================================================================
--- gnunet/src/include/gnunet_testing_lib.h (rev 0)
+++ gnunet/src/include/gnunet_testing_lib.h 2012-12-21 15:09:51 UTC (rev
25629)
@@ -0,0 +1,372 @@
+/*
+ This file is part of GNUnet
+ (C) 2008, 2009, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING. If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+
+/**
+ * @file include/gnunet_testing_lib.h
+ * @brief convenience API for writing testcases for GNUnet;
+ * can start/stop one or more peers on a system;
+ * testing is responsible for managing private keys,
+ * ports and paths; it is a low-level library that
+ * does not support higher-level functions such as
+ * P2P connection, topology management or distributed
+ * testbed maintenance (those are in gnunet_testbed_service.h)
+ * @author Christian Grothoff
+ */
+
+#ifndef GNUNET_TESTING_LIB_H
+#define GNUNET_TESTING_LIB_H
+
+#include "gnunet_util_lib.h"
+#include "gnunet_statistics_service.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#if 0 /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
+#define GNUNET_TESTING_HOSTKEYFILESIZE 914
+
+/**
+ * Handle for a system on which GNUnet peers are executed;
+ * a system is used for reserving unique paths and ports.
+ */
+struct GNUNET_TESTING_System;
+
+
+/**
+ * Handle for a GNUnet peer controlled by testing.
+ */
+struct GNUNET_TESTING_Peer;
+
+
+/**
+ * Create a system handle. There must only be one system handle per operating
+ * system. Uses a default range for allowed ports. Ports are still tested for
+ * availability.
+ *
+ * @param testdir only the directory name without any path. This is used for
all
+ * service homes; the directory will be created in a temporary
location
+ * depending on the underlying OS
+ * @param trusted_ip the ip address which will be set as TRUSTED HOST in all
+ * service configurations generated to allow control connections from
+ * this ip. This can either be a single ip address or a network
address
+ * in CIDR notation.
+ * @param hostname the hostname of the system we are using for testing; NULL
for
+ * localhost
+ * @return handle to this system, NULL on error
+ */
+struct GNUNET_TESTING_System *
+GNUNET_TESTING_system_create (const char *testdir,
+ const char *trusted_ip,
+ const char *hostname);
+
+
+/**
+ * Create a system handle. There must only be one system
+ * handle per operating system. Use this function directly
+ * if multiple system objects are created for the same host
+ * (only really useful when testing --- or to make the port
+ * range configureable).
+ *
+ * @param testdir only the directory name without any path. This is used for
+ * all service homes; the directory will be created in a temporary
+ * location depending on the underlying OS
+ * @param trusted_ip the ip address which will be set as TRUSTED HOST in all
+ * service configurations generated to allow control connections from
+ * this ip. This can either be a single ip address or a network
address
+ * in CIDR notation.
+ * @param controller hostname of the controlling host,
+ * service configurations are modified to allow
+ * control connections from this host; can be NULL
+ * @param hostname the hostname of the system we are using for testing; NULL
for
+ * localhost
+ * @param lowport lowest port number this system is allowed to allocate
(inclusive)
+ * @param highport highest port number this system is allowed to allocate
(exclusive)
+ * @return handle to this system, NULL on error
+ */
+struct GNUNET_TESTING_System *
+GNUNET_TESTING_system_create_with_portrange (const char *testdir,
+ const char *trusted_ip,
+ const char *hostname,
+ uint16_t lowport,
+ uint16_t highport);
+
+
+/**
+ * Free system resources.
+ *
+ * @param system system to be freed
+ * @param remove_paths should the 'testdir' and all subdirectories
+ * be removed (clean up on shutdown)?
+ */
+void
+GNUNET_TESTING_system_destroy (struct GNUNET_TESTING_System *system,
+ int remove_paths);
+
+
+/**
+ * Testing includes a number of pre-created hostkeys for
+ * faster peer startup. This function can be used to
+ * access the n-th key of those pre-created hostkeys; note
+ * that these keys are ONLY useful for testing and not
+ * secure as the private keys are part of the public
+ * GNUnet source code.
+ *
+ * This is primarily a helper function used internally
+ * by 'GNUNET_TESTING_peer_configure'.
+ *
+ * @param system the testing system handle
+ * @param key_number desired pre-created hostkey to obtain
+ * @param id set to the peer's identity (hash of the public
+ * key; if NULL, GNUNET_SYSERR is returned immediately
+ * @return NULL on error (not enough keys)
+ */
+struct GNUNET_CRYPTO_RsaPrivateKey *
+GNUNET_TESTING_hostkey_get (const struct GNUNET_TESTING_System *system,
+ uint32_t key_number,
+ struct GNUNET_PeerIdentity *id);
+
+
+/**
+ * Reserve a TCP or UDP port for a peer.
+ *
+ * @param system system to use for reservation tracking
+ * @param is_tcp GNUNET_YES for TCP ports, GNUNET_NO for UDP
+ * @return 0 if no free port was available
+ */
+uint16_t
+GNUNET_TESTING_reserve_port (struct GNUNET_TESTING_System *system,
+ int is_tcp);
+
+
+/**
+ * Release reservation of a TCP or UDP port for a peer
+ * (used during GNUNET_TESTING_peer_destroy).
+ *
+ * @param system system to use for reservation tracking
+ * @param is_tcp GNUNET_YES for TCP ports, GNUNET_NO for UDP
+ * @param port reserved port to release
+ */
+void
+GNUNET_TESTING_release_port (struct GNUNET_TESTING_System *system,
+ int is_tcp,
+ uint16_t port);
+
+
+/**
+ * Create a new configuration using the given configuration as a template;
+ * ports and paths will be modified to select available ports on the local
+ * system. The default configuration will be available in PATHS section under
+ * the option DEFAULTCONFIG after the call. SERVICE_HOME is also set in PATHS
+ * section to the temporary directory specific to this configuration. If we run
+ * out of "*port" numbers, return SYSERR.
+ *
+ * This is primarily a helper function used internally
+ * by 'GNUNET_TESTING_peer_configure'.
+ *
+ * @param system system to use to coordinate resource usage
+ * @param cfg template configuration to update
+ * @return GNUNET_OK on success, GNUNET_SYSERR on error - the configuration
will
+ * be incomplete and should not be used there upon
+ */
+int
+GNUNET_TESTING_configuration_create (struct GNUNET_TESTING_System *system,
+ struct GNUNET_CONFIGURATION_Handle *cfg);
+// FIXME: add dual to 'release' ports again...
+
+
+/**
+ * Configure a GNUnet peer. GNUnet must be installed on the local
+ * system and available in the PATH.
+ *
+ * @param system system to use to coordinate resource usage
+ * @param cfg configuration to use; will be UPDATED (to reflect needed
+ * changes in port numbers and paths)
+ * @param key_number number of the hostkey to use for the peer
+ * @param id identifier for the daemon, will be set, can be NULL
+ * @param emsg set to freshly allocated error message (set to NULL on
success),
+ * can be NULL
+ * @return handle to the peer, NULL on error
+ */
+struct GNUNET_TESTING_Peer *
+GNUNET_TESTING_peer_configure (struct GNUNET_TESTING_System *system,
+ struct GNUNET_CONFIGURATION_Handle *cfg,
+ uint32_t key_number,
+ struct GNUNET_PeerIdentity *id,
+ char **emsg);
+
+
+/**
+ * Obtain the peer identity from a peer handle.
+ *
+ * @param peer peer handle for which we want the peer's identity
+ * @param id identifier for the daemon, will be set
+ */
+void
+GNUNET_TESTING_peer_get_identity (const struct GNUNET_TESTING_Peer *peer,
+ struct GNUNET_PeerIdentity *id);
+
+
+/**
+ * Start the peer.
+ *
+ * @param peer peer to start
+ * @return GNUNET_OK on success, GNUNET_SYSERR on error (i.e. peer already
running)
+ */
+int
+GNUNET_TESTING_peer_start (struct GNUNET_TESTING_Peer *peer);
+
+
+/**
+ * Stop the peer.
+ *
+ * @param peer peer to stop
+ * @return GNUNET_OK on success, GNUNET_SYSERR on error (i.e. peer not running)
+ */
+int
+GNUNET_TESTING_peer_stop (struct GNUNET_TESTING_Peer *peer);
+
+
+/**
+ * Destroy the peer. Releases resources locked during peer configuration.
+ * If the peer is still running, it will be stopped AND a warning will be
+ * printed (users of the API should stop the peer explicitly first).
+ *
+ * @param peer peer to destroy
+ */
+void
+GNUNET_TESTING_peer_destroy (struct GNUNET_TESTING_Peer *peer);
+
+
+/**
+ * Sends SIGTERM to the peer's main process
+ *
+ * @param peer the handle to the peer
+ * @return GNUNET_OK if successful; GNUNET_SYSERR if the main process is NULL
+ * or upon any error while sending SIGTERM
+ */
+int
+GNUNET_TESTING_peer_kill (struct GNUNET_TESTING_Peer *peer);
+
+
+/**
+ * Waits for a peer to terminate. The peer's main process will also be
destroyed.
+ *
+ * @param peer the handle to the peer
+ * @return GNUNET_OK if successful; GNUNET_SYSERR if the main process is NULL
+ * or upon any error while waiting
+ */
+int
+GNUNET_TESTING_peer_wait (struct GNUNET_TESTING_Peer *peer);
+
+
+/**
+ * Signature of the 'main' function for a (single-peer) testcase that
+ * is run using 'GNUNET_TESTING_peer_run'.
+ *
+ * @param cls closure
+ * @param cfg configuration of the peer that was started
+ * @param peer identity of the peer that was created
+ */
+typedef void (*GNUNET_TESTING_TestMain)(void *cls,
+ const struct
GNUNET_CONFIGURATION_Handle *cfg,
+ struct GNUNET_TESTING_Peer *peer);
+
+
+/**
+ * Start a single peer and run a test using the testing library.
+ * Starts a peer using the given configuration and then invokes the
+ * given callback. This function ALSO initializes the scheduler loop
+ * and should thus be called directly from "main". The testcase
+ * should self-terminate by invoking 'GNUNET_SCHEDULER_shutdown'.
+ *
+ * @param testdir only the directory name without any path. This is used for
+ * all service homes; the directory will be created in a temporary
+ * location depending on the underlying OS
+ * @param cfgfilename name of the configuration file to use;
+ * use NULL to only run with defaults
+ * @param tm main function of the testcase
+ * @param tm_cls closure for 'tm'
+ * @return 0 on success, 1 on error
+ */
+int
+GNUNET_TESTING_peer_run (const char *testdir,
+ const char *cfgfilename,
+ GNUNET_TESTING_TestMain tm,
+ void *tm_cls);
+
+
+/**
+ * Start a single service (no ARM, except of course if the given
+ * service name is 'arm') and run a test using the testing library.
+ * Starts a service using the given configuration and then invokes the
+ * given callback. This function ALSO initializes the scheduler loop
+ * and should thus be called directly from "main". The testcase
+ * should self-terminate by invoking 'GNUNET_SCHEDULER_shutdown'.
+ *
+ * This function is useful if the testcase is for a single service
+ * and if that service doesn't itself depend on other services.
+ *
+ * @param testdir only the directory name without any path. This is used for
+ * all service homes; the directory will be created in a temporary
+ * location depending on the underlying OS
+ * @param service_name name of the service to run
+ * @param cfgfilename name of the configuration file to use;
+ * use NULL to only run with defaults
+ * @param tm main function of the testcase
+ * @param tm_cls closure for 'tm'
+ * @return 0 on success, 1 on error
+ */
+int
+GNUNET_TESTING_service_run (const char *testdir,
+ const char *service_name,
+ const char *cfgfilename,
+ GNUNET_TESTING_TestMain tm,
+ void *tm_cls);
+
+
+/**
+ * Sometimes we use the binary name to determine which specific
+ * test to run. In those cases, the string after the last "_"
+ * in 'argv[0]' specifies a string that determines the configuration
+ * file or plugin to use.
+ *
+ * This function returns the respective substring, taking care
+ * of issues such as binaries ending in '.exe' on W32.
+ *
+ * @param argv0 the name of the binary
+ * @return string between the last '_' and the '.exe' (or the end of the
string),
+ * NULL if argv0 has no '_'
+ */
+char *
+GNUNET_TESTING_get_testname_from_underscore (const char *argv0);
+
+
+#if 0 /* keep Emacsens' auto-indent happy */
+{
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+#endif
Modified: gnunet/src/lockmanager/test_lockmanager_api.c
===================================================================
--- gnunet/src/lockmanager/test_lockmanager_api.c 2012-12-21 15:07:38 UTC
(rev 25628)
+++ gnunet/src/lockmanager/test_lockmanager_api.c 2012-12-21 15:09:51 UTC
(rev 25629)
@@ -27,7 +27,7 @@
#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_lockmanager_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
/**
* Generic logging shortcut
Modified: gnunet/src/lockmanager/test_lockmanager_api_acquireretry.c
===================================================================
--- gnunet/src/lockmanager/test_lockmanager_api_acquireretry.c 2012-12-21
15:07:38 UTC (rev 25628)
+++ gnunet/src/lockmanager/test_lockmanager_api_acquireretry.c 2012-12-21
15:09:51 UTC (rev 25629)
@@ -28,7 +28,7 @@
#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_lockmanager_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
/**
* Generic logging shorthand
Modified: gnunet/src/lockmanager/test_lockmanager_api_lockrelease.c
===================================================================
--- gnunet/src/lockmanager/test_lockmanager_api_lockrelease.c 2012-12-21
15:07:38 UTC (rev 25628)
+++ gnunet/src/lockmanager/test_lockmanager_api_lockrelease.c 2012-12-21
15:09:51 UTC (rev 25629)
@@ -26,7 +26,7 @@
#include "platform.h"
#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "gnunet_lockmanager_service.h"
/**
Modified: gnunet/src/lockmanager/test_lockmanager_api_servercrash.c
===================================================================
--- gnunet/src/lockmanager/test_lockmanager_api_servercrash.c 2012-12-21
15:07:38 UTC (rev 25628)
+++ gnunet/src/lockmanager/test_lockmanager_api_servercrash.c 2012-12-21
15:09:51 UTC (rev 25629)
@@ -27,7 +27,7 @@
#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_lockmanager_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
/**
* Generic logging shorthand
Modified: gnunet/src/mesh/Makefile.am
===================================================================
--- gnunet/src/mesh/Makefile.am 2012-12-21 15:07:38 UTC (rev 25628)
+++ gnunet/src/mesh/Makefile.am 2012-12-21 15:09:51 UTC (rev 25629)
@@ -54,7 +54,7 @@
$(LTLIBINTL)
libgnunetmesh_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) $(WINFLAGS) \
- -version-info 1:0:0
+ -version-info 2:0:1
libgnunetmeshblock_la_SOURCES = \
mesh_block_lib.c mesh_block_lib.h
Modified: gnunet/src/mesh/test_mesh_api.c
===================================================================
--- gnunet/src/mesh/test_mesh_api.c 2012-12-21 15:07:38 UTC (rev 25628)
+++ gnunet/src/mesh/test_mesh_api.c 2012-12-21 15:09:51 UTC (rev 25629)
@@ -25,7 +25,7 @@
*/
#include "platform.h"
#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "gnunet_dht_service.h"
#include "gnunet_mesh_service.h"
Modified: gnunet/src/mesh/test_mesh_local_1.c
===================================================================
--- gnunet/src/mesh/test_mesh_local_1.c 2012-12-21 15:07:38 UTC (rev 25628)
+++ gnunet/src/mesh/test_mesh_local_1.c 2012-12-21 15:09:51 UTC (rev 25629)
@@ -27,7 +27,7 @@
#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_dht_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "gnunet_mesh_service.h"
Modified: gnunet/src/mesh/test_mesh_local_2.c
===================================================================
--- gnunet/src/mesh/test_mesh_local_2.c 2012-12-21 15:07:38 UTC (rev 25628)
+++ gnunet/src/mesh/test_mesh_local_2.c 2012-12-21 15:09:51 UTC (rev 25629)
@@ -26,7 +26,7 @@
#include "platform.h"
#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "gnunet_dht_service.h"
#include "gnunet_mesh_service.h"
Modified: gnunet/src/mesh/test_mesh_local_traffic.c
===================================================================
--- gnunet/src/mesh/test_mesh_local_traffic.c 2012-12-21 15:07:38 UTC (rev
25628)
+++ gnunet/src/mesh/test_mesh_local_traffic.c 2012-12-21 15:09:51 UTC (rev
25629)
@@ -27,7 +27,7 @@
#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_mesh_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include <gauger.h>
#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
Modified: gnunet/src/namestore/test_namestore_api.c
===================================================================
--- gnunet/src/namestore/test_namestore_api.c 2012-12-21 15:07:38 UTC (rev
25628)
+++ gnunet/src/namestore/test_namestore_api.c 2012-12-21 15:09:51 UTC (rev
25629)
@@ -24,7 +24,7 @@
#include "platform.h"
#include "gnunet_common.h"
#include "gnunet_namestore_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#define TEST_RECORD_TYPE 1234
Modified: gnunet/src/namestore/test_namestore_api_create.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_create.c 2012-12-21 15:07:38 UTC
(rev 25628)
+++ gnunet/src/namestore/test_namestore_api_create.c 2012-12-21 15:09:51 UTC
(rev 25629)
@@ -24,7 +24,7 @@
#include "platform.h"
#include "gnunet_common.h"
#include "gnunet_namestore_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "namestore.h"
#include "gnunet_signatures.h"
Modified: gnunet/src/namestore/test_namestore_api_create_update.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_create_update.c 2012-12-21
15:07:38 UTC (rev 25628)
+++ gnunet/src/namestore/test_namestore_api_create_update.c 2012-12-21
15:09:51 UTC (rev 25629)
@@ -24,7 +24,7 @@
#include "platform.h"
#include "gnunet_common.h"
#include "gnunet_namestore_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "namestore.h"
#include "gnunet_signatures.h"
Modified: gnunet/src/namestore/test_namestore_api_lookup.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_lookup.c 2012-12-21 15:07:38 UTC
(rev 25628)
+++ gnunet/src/namestore/test_namestore_api_lookup.c 2012-12-21 15:09:51 UTC
(rev 25629)
@@ -24,7 +24,7 @@
#include "platform.h"
#include "gnunet_common.h"
#include "gnunet_namestore_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "namestore.h"
#include "gnunet_signatures.h"
Modified: gnunet/src/namestore/test_namestore_api_lookup_specific_type.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_lookup_specific_type.c
2012-12-21 15:07:38 UTC (rev 25628)
+++ gnunet/src/namestore/test_namestore_api_lookup_specific_type.c
2012-12-21 15:09:51 UTC (rev 25629)
@@ -24,7 +24,7 @@
#include "platform.h"
#include "gnunet_common.h"
#include "gnunet_namestore_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "namestore.h"
#include "gnunet_signatures.h"
Modified: gnunet/src/namestore/test_namestore_api_put.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_put.c 2012-12-21 15:07:38 UTC
(rev 25628)
+++ gnunet/src/namestore/test_namestore_api_put.c 2012-12-21 15:09:51 UTC
(rev 25629)
@@ -24,7 +24,7 @@
#include "platform.h"
#include "gnunet_common.h"
#include "gnunet_namestore_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "namestore.h"
#define RECORDS 5
Modified: gnunet/src/namestore/test_namestore_api_remove.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_remove.c 2012-12-21 15:07:38 UTC
(rev 25628)
+++ gnunet/src/namestore/test_namestore_api_remove.c 2012-12-21 15:09:51 UTC
(rev 25629)
@@ -24,7 +24,7 @@
#include "platform.h"
#include "gnunet_common.h"
#include "gnunet_namestore_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "namestore.h"
#include "gnunet_signatures.h"
Modified: gnunet/src/namestore/test_namestore_api_remove_not_existing_record.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_remove_not_existing_record.c
2012-12-21 15:07:38 UTC (rev 25628)
+++ gnunet/src/namestore/test_namestore_api_remove_not_existing_record.c
2012-12-21 15:09:51 UTC (rev 25629)
@@ -24,7 +24,7 @@
#include "platform.h"
#include "gnunet_common.h"
#include "gnunet_namestore_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "namestore.h"
#include "gnunet_signatures.h"
Modified: gnunet/src/namestore/test_namestore_api_zone_iteration.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_zone_iteration.c 2012-12-21
15:07:38 UTC (rev 25628)
+++ gnunet/src/namestore/test_namestore_api_zone_iteration.c 2012-12-21
15:09:51 UTC (rev 25629)
@@ -24,7 +24,7 @@
#include "platform.h"
#include "gnunet_common.h"
#include "gnunet_namestore_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "namestore.h"
Modified: gnunet/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
2012-12-21 15:07:38 UTC (rev 25628)
+++ gnunet/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
2012-12-21 15:09:51 UTC (rev 25629)
@@ -23,7 +23,7 @@
*/
#include "platform.h"
#include "gnunet_common.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "gnunet_namestore_service.h"
#include "namestore.h"
Modified: gnunet/src/namestore/test_namestore_api_zone_iteration_stop.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_zone_iteration_stop.c
2012-12-21 15:07:38 UTC (rev 25628)
+++ gnunet/src/namestore/test_namestore_api_zone_iteration_stop.c
2012-12-21 15:09:51 UTC (rev 25629)
@@ -23,7 +23,7 @@
*/
#include "platform.h"
#include "gnunet_common.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "gnunet_namestore_service.h"
#include "namestore.h"
Modified: gnunet/src/namestore/test_namestore_api_zone_to_name.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_zone_to_name.c 2012-12-21
15:07:38 UTC (rev 25628)
+++ gnunet/src/namestore/test_namestore_api_zone_to_name.c 2012-12-21
15:09:51 UTC (rev 25629)
@@ -24,7 +24,7 @@
#include "platform.h"
#include "gnunet_common.h"
#include "gnunet_namestore_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "namestore.h"
#include "gnunet_signatures.h"
Modified: gnunet/src/namestore/test_plugin_namestore.c
===================================================================
--- gnunet/src/namestore/test_plugin_namestore.c 2012-12-21 15:07:38 UTC
(rev 25628)
+++ gnunet/src/namestore/test_plugin_namestore.c 2012-12-21 15:09:51 UTC
(rev 25629)
@@ -25,7 +25,7 @@
#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_namestore_plugin.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#define ASSERT(x) do { if (! (x)) { printf("Error at %s:%d\n", __FILE__,
__LINE__); goto FAILURE;} } while (0)
Modified: gnunet/src/nat/Makefile.am
===================================================================
--- gnunet/src/nat/Makefile.am 2012-12-21 15:07:38 UTC (rev 25628)
+++ gnunet/src/nat/Makefile.am 2012-12-21 15:09:51 UTC (rev 25629)
@@ -64,7 +64,7 @@
libgnunetnat_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) $(WINFLAGS) \
- -version-info 0:1:0
+ -version-info 1:0:1
check_PROGRAMS = \
test_nat \
Modified: gnunet/src/nse/test_nse_api.c
===================================================================
--- gnunet/src/nse/test_nse_api.c 2012-12-21 15:07:38 UTC (rev 25628)
+++ gnunet/src/nse/test_nse_api.c 2012-12-21 15:09:51 UTC (rev 25629)
@@ -24,7 +24,7 @@
#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_nse_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
static struct GNUNET_NSE_Handle *h;
Modified: gnunet/src/peerinfo/perf_peerinfo_api.c
===================================================================
--- gnunet/src/peerinfo/perf_peerinfo_api.c 2012-12-21 15:07:38 UTC (rev
25628)
+++ gnunet/src/peerinfo/perf_peerinfo_api.c 2012-12-21 15:09:51 UTC (rev
25629)
@@ -27,7 +27,7 @@
#include "platform.h"
#include "gnunet_hello_lib.h"
#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "gnunet_peerinfo_service.h"
#include "peerinfo.h"
#include <gauger.h>
Modified: gnunet/src/peerinfo/test_peerinfo_api.c
===================================================================
--- gnunet/src/peerinfo/test_peerinfo_api.c 2012-12-21 15:07:38 UTC (rev
25628)
+++ gnunet/src/peerinfo/test_peerinfo_api.c 2012-12-21 15:09:51 UTC (rev
25629)
@@ -30,7 +30,7 @@
#include "gnunet_hello_lib.h"
#include "gnunet_util_lib.h"
#include "gnunet_peerinfo_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "peerinfo.h"
static struct GNUNET_PEERINFO_IteratorContext *ic;
Modified: gnunet/src/pt/test_gns_vpn.c
===================================================================
--- gnunet/src/pt/test_gns_vpn.c 2012-12-21 15:07:38 UTC (rev 25628)
+++ gnunet/src/pt/test_gns_vpn.c 2012-12-21 15:09:51 UTC (rev 25629)
@@ -28,7 +28,7 @@
#include <microhttpd.h>
#include "gnunet_namestore_service.h"
#include "gnunet_gns_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#define PORT 8080
#define TEST_DOMAIN "www.gads"
Modified: gnunet/src/pt/test_gnunet_vpn.c
===================================================================
--- gnunet/src/pt/test_gnunet_vpn.c 2012-12-21 15:07:38 UTC (rev 25628)
+++ gnunet/src/pt/test_gnunet_vpn.c 2012-12-21 15:09:51 UTC (rev 25629)
@@ -27,7 +27,7 @@
#include <curl/curl.h>
#include <microhttpd.h>
#include "gnunet_vpn_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#define PORT 48080
Modified: gnunet/src/regex/Makefile.am
===================================================================
--- gnunet/src/regex/Makefile.am 2012-12-21 15:07:38 UTC (rev 25628)
+++ gnunet/src/regex/Makefile.am 2012-12-21 15:09:51 UTC (rev 25629)
@@ -17,7 +17,7 @@
$(top_builddir)/src/util/libgnunetutil.la
libgnunetregex_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) \
- -version-info 0:0:0
+ -version-info 1:1:0
if HAVE_MYSQL
noinst_mysql_progs = \
Modified: gnunet/src/stream/Makefile.am
===================================================================
--- gnunet/src/stream/Makefile.am 2012-12-21 15:07:38 UTC (rev 25628)
+++ gnunet/src/stream/Makefile.am 2012-12-21 15:09:51 UTC (rev 25629)
@@ -20,7 +20,7 @@
$(top_builddir)/src/util/libgnunetutil.la $(XLIB)
libgnunetstream_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) \
- -version-info 0:0:0
+ -version-info 1:0:0
if HAVE_BENCHMARKS
STREAM_BENCHMARKS = \
Modified: gnunet/src/stream/test_stream_big.c
===================================================================
--- gnunet/src/stream/test_stream_big.c 2012-12-21 15:07:38 UTC (rev 25628)
+++ gnunet/src/stream/test_stream_big.c 2012-12-21 15:09:51 UTC (rev 25629)
@@ -29,7 +29,7 @@
#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_stream_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#define LOG(kind, ...) \
GNUNET_log (kind, __VA_ARGS__);
Modified: gnunet/src/stream/test_stream_local.c
===================================================================
--- gnunet/src/stream/test_stream_local.c 2012-12-21 15:07:38 UTC (rev
25628)
+++ gnunet/src/stream/test_stream_local.c 2012-12-21 15:09:51 UTC (rev
25629)
@@ -30,7 +30,7 @@
#include "gnunet_util_lib.h"
#include "gnunet_mesh_service.h"
#include "gnunet_stream_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
/**
* Relative seconds shorthand
Modified: gnunet/src/stream/test_stream_sequence_wraparound.c
===================================================================
--- gnunet/src/stream/test_stream_sequence_wraparound.c 2012-12-21 15:07:38 UTC
(rev 25628)
+++ gnunet/src/stream/test_stream_sequence_wraparound.c 2012-12-21 15:09:51 UTC
(rev 25629)
@@ -29,7 +29,7 @@
#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_stream_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
/**
* Generic logging shorthand
Modified: gnunet/src/testbed/gnunet-helper-testbed.c
===================================================================
--- gnunet/src/testbed/gnunet-helper-testbed.c 2012-12-21 15:07:38 UTC (rev
25628)
+++ gnunet/src/testbed/gnunet-helper-testbed.c 2012-12-21 15:09:51 UTC (rev
25629)
@@ -32,7 +32,7 @@
#include "platform.h"
#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "gnunet_testbed_service.h"
#include "testbed_helper.h"
#include "testbed_api.h"
Modified: gnunet/src/testbed/gnunet-service-testbed.c
===================================================================
--- gnunet/src/testbed/gnunet-service-testbed.c 2012-12-21 15:07:38 UTC (rev
25628)
+++ gnunet/src/testbed/gnunet-service-testbed.c 2012-12-21 15:09:51 UTC (rev
25629)
@@ -36,7 +36,7 @@
#include "testbed.h"
#include "testbed_api.h"
#include "testbed_api_hosts.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
/**
* Generic logging
Modified: gnunet/src/testbed/test_testbed_api.c
===================================================================
--- gnunet/src/testbed/test_testbed_api.c 2012-12-21 15:07:38 UTC (rev
25628)
+++ gnunet/src/testbed/test_testbed_api.c 2012-12-21 15:09:51 UTC (rev
25629)
@@ -27,7 +27,7 @@
#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_dht_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "gnunet_testbed_service.h"
/**
Modified: gnunet/src/testbed/test_testbed_api_2peers_1controller.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_2peers_1controller.c 2012-12-21
15:07:38 UTC (rev 25628)
+++ gnunet/src/testbed/test_testbed_api_2peers_1controller.c 2012-12-21
15:09:51 UTC (rev 25629)
@@ -27,7 +27,7 @@
#include "platform.h"
#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "gnunet_testbed_service.h"
Modified: gnunet/src/testbed/test_testbed_api_3peers_3controllers.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_3peers_3controllers.c 2012-12-21
15:07:38 UTC (rev 25628)
+++ gnunet/src/testbed/test_testbed_api_3peers_3controllers.c 2012-12-21
15:09:51 UTC (rev 25629)
@@ -44,7 +44,7 @@
#include "platform.h"
#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "gnunet_testbed_service.h"
Modified: gnunet/src/testbed/test_testbed_api_controllerlink.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_controllerlink.c 2012-12-21
15:07:38 UTC (rev 25628)
+++ gnunet/src/testbed/test_testbed_api_controllerlink.c 2012-12-21
15:09:51 UTC (rev 25629)
@@ -39,7 +39,7 @@
#include "platform.h"
#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "gnunet_testbed_service.h"
/**
Modified: gnunet/src/testing/Makefile.am
===================================================================
--- gnunet/src/testing/Makefile.am 2012-12-21 15:07:38 UTC (rev 25628)
+++ gnunet/src/testing/Makefile.am 2012-12-21 15:09:51 UTC (rev 25629)
@@ -24,7 +24,7 @@
$(LTLIBINTL)
libgnunettesting_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) \
- -version-info 1:0:0
+ -version-info 2:0:1
bin_PROGRAMS = \
gnunet-testing-run-service \
Modified: gnunet/src/testing/gnunet-testing-run-service.c
===================================================================
--- gnunet/src/testing/gnunet-testing-run-service.c 2012-12-21 15:07:38 UTC
(rev 25628)
+++ gnunet/src/testing/gnunet-testing-run-service.c 2012-12-21 15:09:51 UTC
(rev 25629)
@@ -36,7 +36,7 @@
*/
#include "platform.h"
#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#define LOG(kind,...) \
GNUNET_log_from (kind, "gnunet-testing", __VA_ARGS__)
Modified: gnunet/src/testing/gnunet-testing.c
===================================================================
--- gnunet/src/testing/gnunet-testing.c 2012-12-21 15:07:38 UTC (rev 25628)
+++ gnunet/src/testing/gnunet-testing.c 2012-12-21 15:09:51 UTC (rev 25629)
@@ -25,7 +25,7 @@
*/
#include "platform.h"
#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#define HOSTKEYFILESIZE 914
Modified: gnunet/src/testing/test_testing_peerstartup.c
===================================================================
--- gnunet/src/testing/test_testing_peerstartup.c 2012-12-21 15:07:38 UTC
(rev 25628)
+++ gnunet/src/testing/test_testing_peerstartup.c 2012-12-21 15:09:51 UTC
(rev 25629)
@@ -28,7 +28,7 @@
#include "platform.h"
#include "gnunet_configuration_lib.h"
#include "gnunet_os_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#define LOG(kind,...) \
GNUNET_log (kind, __VA_ARGS__)
Modified: gnunet/src/testing/test_testing_portreservation.c
===================================================================
--- gnunet/src/testing/test_testing_portreservation.c 2012-12-21 15:07:38 UTC
(rev 25628)
+++ gnunet/src/testing/test_testing_portreservation.c 2012-12-21 15:09:51 UTC
(rev 25629)
@@ -27,7 +27,7 @@
#include "platform.h"
#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#define LOG(kind,...) \
GNUNET_log (kind, __VA_ARGS__)
Modified: gnunet/src/testing/test_testing_servicestartup.c
===================================================================
--- gnunet/src/testing/test_testing_servicestartup.c 2012-12-21 15:07:38 UTC
(rev 25628)
+++ gnunet/src/testing/test_testing_servicestartup.c 2012-12-21 15:09:51 UTC
(rev 25629)
@@ -25,7 +25,7 @@
*/
#include "platform.h"
#include "gnunet_scheduler_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#define LOG(kind,...) \
Modified: gnunet/src/testing/testing.c
===================================================================
--- gnunet/src/testing/testing.c 2012-12-21 15:07:38 UTC (rev 25628)
+++ gnunet/src/testing/testing.c 2012-12-21 15:09:51 UTC (rev 25629)
@@ -31,7 +31,7 @@
*/
#include "platform.h"
#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#define LOG(kind,...) \
GNUNET_log_from (kind, "testing-api", __VA_ARGS__)
Modified: gnunet/src/transport/Makefile.am
===================================================================
--- gnunet/src/transport/Makefile.am 2012-12-21 15:07:38 UTC (rev 25628)
+++ gnunet/src/transport/Makefile.am 2012-12-21 15:09:51 UTC (rev 25629)
@@ -109,7 +109,7 @@
$(GN_LIBINTL)
libgnunettransport_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) $(WINFLAGS) \
- -version-info 1:1:0
+ -version-info 2:0:0
libexec_PROGRAMS = \
$(WLAN_BIN) \
Modified: gnunet/src/transport/transport-testing.h
===================================================================
--- gnunet/src/transport/transport-testing.h 2012-12-21 15:07:38 UTC (rev
25628)
+++ gnunet/src/transport/transport-testing.h 2012-12-21 15:09:51 UTC (rev
25629)
@@ -31,7 +31,7 @@
#include "gnunet_program_lib.h"
#include "gnunet_container_lib.h"
#include "gnunet_transport_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#define GNUNET_TRANSPORT_TESTING_ConnectRequest void *
Modified: gnunet/src/util/Makefile.am
===================================================================
--- gnunet/src/util/Makefile.am 2012-12-21 15:07:38 UTC (rev 25628)
+++ gnunet/src/util/Makefile.am 2012-12-21 15:09:51 UTC (rev 25629)
@@ -119,7 +119,7 @@
libgnunetutil_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) \
- -version-info 9:0:0
+ -version-info 10:0:1
libexec_PROGRAMS = \
Modified: gnunet/src/util/gnunet-ecc.c
===================================================================
--- gnunet/src/util/gnunet-ecc.c 2012-12-21 15:07:38 UTC (rev 25628)
+++ gnunet/src/util/gnunet-ecc.c 2012-12-21 15:09:51 UTC (rev 25629)
@@ -25,7 +25,7 @@
*/
#include "platform.h"
#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include <gcrypt.h>
Modified: gnunet/src/util/gnunet-rsa.c
===================================================================
--- gnunet/src/util/gnunet-rsa.c 2012-12-21 15:07:38 UTC (rev 25628)
+++ gnunet/src/util/gnunet-rsa.c 2012-12-21 15:09:51 UTC (rev 25629)
@@ -25,7 +25,7 @@
*/
#include "platform.h"
#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include <gcrypt.h>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r25629 - in gnunet: . src/ats src/consensus src/core src/datacache src/datastore src/dht src/dns src/fs src/gns src/hello src/include src/lockmanager src/mesh src/namestore src/nat src/nse src/peerinfo src/pt src/regex src/stream src/testbed src/testing src/transport src/util,
gnunet <=