diff options
-rw-r--r-- | src/testbed/testbed.h | 2 | ||||
-rw-r--r-- | src/testbed/testbed_api.c | 6 | ||||
-rw-r--r-- | src/testbed/testbed_api_hosts.c | 6 | ||||
-rw-r--r-- | src/testbed/testbed_api_hosts.h | 6 | ||||
-rw-r--r-- | src/testbed/testbed_api_operations.c | 6 | ||||
-rw-r--r-- | src/testbed/testbed_api_operations.h | 6 | ||||
-rw-r--r-- | src/testbed/testbed_api_peers.c | 6 | ||||
-rw-r--r-- | src/testbed/testbed_api_peers.h | 6 | ||||
-rw-r--r-- | src/testbed/testbed_api_services.c | 6 | ||||
-rw-r--r-- | src/testbed/testbed_api_test.c | 6 | ||||
-rw-r--r-- | src/testbed/testbed_api_testbed.c | 6 | ||||
-rw-r--r-- | src/testbed/testbed_api_topology.c | 6 | ||||
-rw-r--r-- | src/testing/Makefile.am | 23 |
13 files changed, 35 insertions, 56 deletions
diff --git a/src/testbed/testbed.h b/src/testbed/testbed.h index 4e4e490f0..2cb4ede7e 100644 --- a/src/testbed/testbed.h +++ b/src/testbed/testbed.h | |||
@@ -19,7 +19,7 @@ | |||
19 | */ | 19 | */ |
20 | 20 | ||
21 | /** | 21 | /** |
22 | * @file testing/new_testing.h | 22 | * @file testing/testbed.h |
23 | * @brief IPC messages between testing API and service ("controller") | 23 | * @brief IPC messages between testing API and service ("controller") |
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | */ | 25 | */ |
diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c index bffe8162f..fd6db8d14 100644 --- a/src/testbed/testbed_api.c +++ b/src/testbed/testbed_api.c | |||
@@ -19,14 +19,14 @@ | |||
19 | */ | 19 | */ |
20 | 20 | ||
21 | /** | 21 | /** |
22 | * @file testing/new_testing_api.c | 22 | * @file testing/testbed_api.c |
23 | * @brief API for accessing the GNUnet testing service. | 23 | * @brief API for accessing the GNUnet testing service. |
24 | * This library is supposed to make it easier to write | 24 | * This library is supposed to make it easier to write |
25 | * testcases and script large-scale benchmarks. | 25 | * testcases and script large-scale benchmarks. |
26 | * @author Christian Grothoff | 26 | * @author Christian Grothoff |
27 | */ | 27 | */ |
28 | #include "platform.h" | 28 | #include "platform.h" |
29 | #include "gnunet_testing_service.h" | 29 | #include "gnunet_testbed_service.h" |
30 | #include "gnunet_core_service.h" | 30 | #include "gnunet_core_service.h" |
31 | #include "gnunet_constants.h" | 31 | #include "gnunet_constants.h" |
32 | #include "gnunet_transport_service.h" | 32 | #include "gnunet_transport_service.h" |
@@ -147,4 +147,4 @@ GNUNET_TESTBED_overlay_write_topology_to_file (struct GNUNET_TESTBED_Controller | |||
147 | 147 | ||
148 | 148 | ||
149 | 149 | ||
150 | /* end of new_testing_api.c */ | 150 | /* end of testbed_api.c */ |
diff --git a/src/testbed/testbed_api_hosts.c b/src/testbed/testbed_api_hosts.c index f9ddfdc07..4c23289d6 100644 --- a/src/testbed/testbed_api_hosts.c +++ b/src/testbed/testbed_api_hosts.c | |||
@@ -19,14 +19,14 @@ | |||
19 | */ | 19 | */ |
20 | 20 | ||
21 | /** | 21 | /** |
22 | * @file testing/new_testing_api_hosts.c | 22 | * @file testing/testbed_api_hosts.c |
23 | * @brief API for manipulating 'hosts' controlled by the GNUnet testing service; | 23 | * @brief API for manipulating 'hosts' controlled by the GNUnet testing service; |
24 | * allows parsing hosts files, starting, stopping and communicating (via | 24 | * allows parsing hosts files, starting, stopping and communicating (via |
25 | * SSH/stdin/stdout) with the remote (or local) processes | 25 | * SSH/stdin/stdout) with the remote (or local) processes |
26 | * @author Christian Grothoff | 26 | * @author Christian Grothoff |
27 | */ | 27 | */ |
28 | #include "platform.h" | 28 | #include "platform.h" |
29 | #include "gnunet_testing_service.h" | 29 | #include "gnunet_testbed_service.h" |
30 | #include "gnunet_core_service.h" | 30 | #include "gnunet_core_service.h" |
31 | #include "gnunet_constants.h" | 31 | #include "gnunet_constants.h" |
32 | #include "gnunet_transport_service.h" | 32 | #include "gnunet_transport_service.h" |
@@ -197,4 +197,4 @@ GNUNET_TESTBED_host_run_ (struct GNUNET_TESTBED_Host *host, | |||
197 | } | 197 | } |
198 | 198 | ||
199 | 199 | ||
200 | /* end of new_testing_api_hosts.c */ | 200 | /* end of testbed_api_hosts.c */ |
diff --git a/src/testbed/testbed_api_hosts.h b/src/testbed/testbed_api_hosts.h index 269b3f2af..73fb14790 100644 --- a/src/testbed/testbed_api_hosts.h +++ b/src/testbed/testbed_api_hosts.h | |||
@@ -19,14 +19,14 @@ | |||
19 | */ | 19 | */ |
20 | 20 | ||
21 | /** | 21 | /** |
22 | * @file testing/new_testing_api_hosts.h | 22 | * @file testing/testbed_api_hosts.h |
23 | * @brief internal API to access the 'hosts' subsystem | 23 | * @brief internal API to access the 'hosts' subsystem |
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | */ | 25 | */ |
26 | #ifndef NEW_TESTING_API_HOSTS_H | 26 | #ifndef NEW_TESTING_API_HOSTS_H |
27 | #define NEW_TESTING_API_HOSTS_H | 27 | #define NEW_TESTING_API_HOSTS_H |
28 | 28 | ||
29 | #include "gnunet_testing_service.h" | 29 | #include "gnunet_testbed_service.h" |
30 | #include "gnunet_helper_lib.h" | 30 | #include "gnunet_helper_lib.h" |
31 | 31 | ||
32 | 32 | ||
@@ -102,4 +102,4 @@ GNUNET_TESTBED_host_run_ (struct GNUNET_TESTBED_Host *host, | |||
102 | GNUNET_SERVER_MessageTokenizerCallback cb, void *cb_cls); | 102 | GNUNET_SERVER_MessageTokenizerCallback cb, void *cb_cls); |
103 | 103 | ||
104 | #endif | 104 | #endif |
105 | /* end of new_testing_api_hosts.h */ | 105 | /* end of testbed_api_hosts.h */ |
diff --git a/src/testbed/testbed_api_operations.c b/src/testbed/testbed_api_operations.c index fa75cf435..33c71d917 100644 --- a/src/testbed/testbed_api_operations.c +++ b/src/testbed/testbed_api_operations.c | |||
@@ -19,12 +19,12 @@ | |||
19 | */ | 19 | */ |
20 | 20 | ||
21 | /** | 21 | /** |
22 | * @file testing/new_testing_api_operations.c | 22 | * @file testing/testbed_api_operations.c |
23 | * @brief functions to manage operation queues | 23 | * @brief functions to manage operation queues |
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | */ | 25 | */ |
26 | #include "platform.h" | 26 | #include "platform.h" |
27 | #include "new_testing_api_operations.h" | 27 | #include "testbed_api_operations.h" |
28 | 28 | ||
29 | 29 | ||
30 | /** | 30 | /** |
@@ -71,4 +71,4 @@ GNUNET_TESTBED_operation_done (struct GNUNET_TESTBED_Operation *operation) | |||
71 | 71 | ||
72 | 72 | ||
73 | 73 | ||
74 | /* end of new_testing_api_operations.c */ | 74 | /* end of testbed_api_operations.c */ |
diff --git a/src/testbed/testbed_api_operations.h b/src/testbed/testbed_api_operations.h index 3636fa421..89d4b09a1 100644 --- a/src/testbed/testbed_api_operations.h +++ b/src/testbed/testbed_api_operations.h | |||
@@ -19,16 +19,16 @@ | |||
19 | */ | 19 | */ |
20 | 20 | ||
21 | /** | 21 | /** |
22 | * @file testing/new_testing_api_operations.h | 22 | * @file testing/testbed_api_operations.h |
23 | * @brief internal API to access the 'operations' subsystem | 23 | * @brief internal API to access the 'operations' subsystem |
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | */ | 25 | */ |
26 | #ifndef NEW_TESTING_API_OPERATIONS_H | 26 | #ifndef NEW_TESTING_API_OPERATIONS_H |
27 | #define NEW_TESTING_API_OPERATIONS_H | 27 | #define NEW_TESTING_API_OPERATIONS_H |
28 | 28 | ||
29 | #include "gnunet_testing_service.h" | 29 | #include "gnunet_testbed_service.h" |
30 | #include "gnunet_helper_lib.h" | 30 | #include "gnunet_helper_lib.h" |
31 | 31 | ||
32 | 32 | ||
33 | #endif | 33 | #endif |
34 | /* end of new_testing_api_operations.h */ | 34 | /* end of testbed_api_operations.h */ |
diff --git a/src/testbed/testbed_api_peers.c b/src/testbed/testbed_api_peers.c index c73a0958a..3531c838a 100644 --- a/src/testbed/testbed_api_peers.c +++ b/src/testbed/testbed_api_peers.c | |||
@@ -19,13 +19,13 @@ | |||
19 | */ | 19 | */ |
20 | 20 | ||
21 | /** | 21 | /** |
22 | * @file testing/new_testing_api_peers.c | 22 | * @file testing/testbed_api_peers.c |
23 | * @brief management of the knowledge about peers in this library | 23 | * @brief management of the knowledge about peers in this library |
24 | * (we know the peer ID, its host, pending operations, etc.) | 24 | * (we know the peer ID, its host, pending operations, etc.) |
25 | * @author Christian Grothoff | 25 | * @author Christian Grothoff |
26 | */ | 26 | */ |
27 | #include "platform.h" | 27 | #include "platform.h" |
28 | #include "new_testing_api_peers.h" | 28 | #include "testbed_api_peers.h" |
29 | 29 | ||
30 | 30 | ||
31 | /** | 31 | /** |
@@ -294,4 +294,4 @@ GNUNET_TESTBED_overlay_connect (void *op_cls, | |||
294 | 294 | ||
295 | 295 | ||
296 | 296 | ||
297 | /* end of new_testing_api_peers.c */ | 297 | /* end of testbed_api_peers.c */ |
diff --git a/src/testbed/testbed_api_peers.h b/src/testbed/testbed_api_peers.h index 6b2ed7c8b..5c6b53164 100644 --- a/src/testbed/testbed_api_peers.h +++ b/src/testbed/testbed_api_peers.h | |||
@@ -19,14 +19,14 @@ | |||
19 | */ | 19 | */ |
20 | 20 | ||
21 | /** | 21 | /** |
22 | * @file testing/new_testing_api_peers.h | 22 | * @file testing/testbed_api_peers.h |
23 | * @brief internal API to access the 'peers' subsystem | 23 | * @brief internal API to access the 'peers' subsystem |
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | */ | 25 | */ |
26 | #ifndef NEW_TESTING_API_PEERS_H | 26 | #ifndef NEW_TESTING_API_PEERS_H |
27 | #define NEW_TESTING_API_PEERS_H | 27 | #define NEW_TESTING_API_PEERS_H |
28 | 28 | ||
29 | #include "gnunet_testing_service.h" | 29 | #include "gnunet_testbed_service.h" |
30 | #include "gnunet_helper_lib.h" | 30 | #include "gnunet_helper_lib.h" |
31 | 31 | ||
32 | 32 | ||
@@ -68,4 +68,4 @@ GNUNET_TESTBED_peer_create_with_id_ (uint32_t unique_id, | |||
68 | 68 | ||
69 | 69 | ||
70 | #endif | 70 | #endif |
71 | /* end of new_testing_api_peers.h */ | 71 | /* end of testbed_api_peers.h */ |
diff --git a/src/testbed/testbed_api_services.c b/src/testbed/testbed_api_services.c index 524ec35e3..89427bfd9 100644 --- a/src/testbed/testbed_api_services.c +++ b/src/testbed/testbed_api_services.c | |||
@@ -19,12 +19,12 @@ | |||
19 | */ | 19 | */ |
20 | 20 | ||
21 | /** | 21 | /** |
22 | * @file testing/new_testing_api_services.c | 22 | * @file testing/testbed_api_services.c |
23 | * @brief convenience functions for accessing services | 23 | * @brief convenience functions for accessing services |
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | */ | 25 | */ |
26 | #include "platform.h" | 26 | #include "platform.h" |
27 | #include "new_testing_api_peers.h" | 27 | #include "testbed_api_peers.h" |
28 | 28 | ||
29 | 29 | ||
30 | /** | 30 | /** |
@@ -58,4 +58,4 @@ GNUNET_TESTBED_service_connect (void *op_cls, | |||
58 | return NULL; | 58 | return NULL; |
59 | } | 59 | } |
60 | 60 | ||
61 | /* end of new_testing_api_services.c */ | 61 | /* end of testbed_api_services.c */ |
diff --git a/src/testbed/testbed_api_test.c b/src/testbed/testbed_api_test.c index ed5e2e8e3..5716fc1c3 100644 --- a/src/testbed/testbed_api_test.c +++ b/src/testbed/testbed_api_test.c | |||
@@ -19,12 +19,12 @@ | |||
19 | */ | 19 | */ |
20 | 20 | ||
21 | /** | 21 | /** |
22 | * @file testing/new_testing_api_test.c | 22 | * @file testing/testbed_api_test.c |
23 | * @brief high-level test function | 23 | * @brief high-level test function |
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | */ | 25 | */ |
26 | #include "platform.h" | 26 | #include "platform.h" |
27 | #include "gnunet_testing_service.h" | 27 | #include "gnunet_testbed_service.h" |
28 | 28 | ||
29 | 29 | ||
30 | 30 | ||
@@ -64,4 +64,4 @@ GNUNET_TESTBED_test_run (const char *testname, | |||
64 | 64 | ||
65 | 65 | ||
66 | 66 | ||
67 | /* end of new_testing_api_test.c */ | 67 | /* end of testbed_api_test.c */ |
diff --git a/src/testbed/testbed_api_testbed.c b/src/testbed/testbed_api_testbed.c index 8c917db81..905b12e15 100644 --- a/src/testbed/testbed_api_testbed.c +++ b/src/testbed/testbed_api_testbed.c | |||
@@ -19,12 +19,12 @@ | |||
19 | */ | 19 | */ |
20 | 20 | ||
21 | /** | 21 | /** |
22 | * @file testing/new_testing_api_testbed.c | 22 | * @file testing/testbed_api_testbed.c |
23 | * @brief high-level testbed management | 23 | * @brief high-level testbed management |
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | */ | 25 | */ |
26 | #include "platform.h" | 26 | #include "platform.h" |
27 | #include "gnunet_testing_service.h" | 27 | #include "gnunet_testbed_service.h" |
28 | 28 | ||
29 | 29 | ||
30 | /** | 30 | /** |
@@ -150,4 +150,4 @@ GNUNET_TESTBED_run (const char *host_filename, | |||
150 | 150 | ||
151 | 151 | ||
152 | 152 | ||
153 | /* end of new_testing_api_testbed.c */ | 153 | /* end of testbed_api_testbed.c */ |
diff --git a/src/testbed/testbed_api_topology.c b/src/testbed/testbed_api_topology.c index 12def3a1f..b25bfbc90 100644 --- a/src/testbed/testbed_api_topology.c +++ b/src/testbed/testbed_api_topology.c | |||
@@ -19,12 +19,12 @@ | |||
19 | */ | 19 | */ |
20 | 20 | ||
21 | /** | 21 | /** |
22 | * @file testing/new_testing_api_topology.c | 22 | * @file testing/testbed_api_topology.c |
23 | * @brief topology-generation functions | 23 | * @brief topology-generation functions |
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | */ | 25 | */ |
26 | #include "platform.h" | 26 | #include "platform.h" |
27 | #include "gnunet_testing_service.h" | 27 | #include "gnunet_testbed_service.h" |
28 | 28 | ||
29 | 29 | ||
30 | /** | 30 | /** |
@@ -124,4 +124,4 @@ GNUNET_TESTBED_overlay_configure_topology (void *op_cls, | |||
124 | return NULL; | 124 | return NULL; |
125 | } | 125 | } |
126 | 126 | ||
127 | /* end of new_testing_api_topology.c */ | 127 | /* end of testbed_api_topology.c */ |
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am index 9dfe66b92..4f6f90c4d 100644 --- a/src/testing/Makefile.am +++ b/src/testing/Makefile.am | |||
@@ -34,28 +34,7 @@ if HAVE_EXPENSIVE_TESTS | |||
34 | endif | 34 | endif |
35 | 35 | ||
36 | lib_LTLIBRARIES = \ | 36 | lib_LTLIBRARIES = \ |
37 | libgnunettesting.la \ | 37 | libgnunettesting.la |
38 | libgnunettesting_new.la | ||
39 | |||
40 | libgnunettesting_new_la_SOURCES = \ | ||
41 | new_testing_api.c new_testing.h \ | ||
42 | new_testing_api_hosts.c new_testing_api_hosts.h \ | ||
43 | new_testing_api_operations.c new_testing_api_operations.h \ | ||
44 | new_testing_api_peers.c new_testing_api_peers.h \ | ||
45 | new_testing_api_services.c \ | ||
46 | new_testing_api_testbed.c \ | ||
47 | new_testing_api_test.c \ | ||
48 | new_testing_api_topology.c | ||
49 | libgnunettesting_new_la_LIBADD = $(XLIB) \ | ||
50 | $(top_builddir)/src/core/libgnunetcore.la \ | ||
51 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | ||
52 | $(top_builddir)/src/transport/libgnunettransport.la \ | ||
53 | $(top_builddir)/src/hello/libgnunethello.la \ | ||
54 | -lm \ | ||
55 | $(top_builddir)/src/util/libgnunetutil.la | ||
56 | libgnunettesting_new_la_LDFLAGS = \ | ||
57 | $(GN_LIB_LDFLAGS) \ | ||
58 | -version-info 0:0:0 | ||
59 | 38 | ||
60 | libgnunettesting_la_SOURCES = \ | 39 | libgnunettesting_la_SOURCES = \ |
61 | helper.c \ | 40 | helper.c \ |