diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2012-06-10 17:28:57 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2012-06-10 17:28:57 +0000 |
commit | 06911f8500b00a945947ca8eae6f7fbb758f5efb (patch) | |
tree | 40497dba09013b6eed9eb7c895ee3a5dfb136dae /src/include | |
parent | bb8ba0f0be8bfd477b35b30c58be8e572945139c (diff) | |
download | gnunet-06911f8500b00a945947ca8eae6f7fbb758f5efb.tar.gz gnunet-06911f8500b00a945947ca8eae6f7fbb758f5efb.zip |
-updated documentation
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/gnunet_testing_lib-new.h | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/include/gnunet_testing_lib-new.h b/src/include/gnunet_testing_lib-new.h index 9bd6c3b25..c3d17c48d 100644 --- a/src/include/gnunet_testing_lib-new.h +++ b/src/include/gnunet_testing_lib-new.h | |||
@@ -62,14 +62,16 @@ struct GNUNET_TESTING_Peer; | |||
62 | * Create a system handle. There must only be one system | 62 | * Create a system handle. There must only be one system |
63 | * handle per operating system. | 63 | * handle per operating system. |
64 | * | 64 | * |
65 | * @param tmppath prefix path to use for all service homes | 65 | ** @param testdir only the directory name without any path. This is used for |
66 | * all service homes; the directory will be created in a temporary | ||
67 | * location depending on the underlying OS | ||
66 | * @param controller hostname of the controlling host, | 68 | * @param controller hostname of the controlling host, |
67 | * service configurations are modified to allow | 69 | * service configurations are modified to allow |
68 | * control connections from this host; can be NULL | 70 | * control connections from this host; can be NULL |
69 | * @return handle to this system, NULL on error | 71 | * @return handle to this system, NULL on error |
70 | */ | 72 | */ |
71 | struct GNUNET_TESTING_System * | 73 | struct GNUNET_TESTING_System * |
72 | GNUNET_TESTING_system_create (const char *tmppath, | 74 | GNUNET_TESTING_system_create (const char *testdir, |
73 | const char *controller); | 75 | const char *controller); |
74 | 76 | ||
75 | 77 | ||
@@ -77,7 +79,7 @@ GNUNET_TESTING_system_create (const char *tmppath, | |||
77 | * Free system resources. | 79 | * Free system resources. |
78 | * | 80 | * |
79 | * @param system system to be freed | 81 | * @param system system to be freed |
80 | * @param remove_paths should the 'tmppath' and all subdirectories | 82 | * @param remove_paths should the 'testdir' and all subdirectories |
81 | * be removed (clean up on shutdown)? | 83 | * be removed (clean up on shutdown)? |
82 | */ | 84 | */ |
83 | void | 85 | void |
@@ -223,8 +225,9 @@ typedef void (*GNUNET_TESTING_TestMain)(void *cls, | |||
223 | * and should thus be called directly from "main". The testcase | 225 | * and should thus be called directly from "main". The testcase |
224 | * should self-terminate by invoking 'GNUNET_SCHEDULER_shutdown'. | 226 | * should self-terminate by invoking 'GNUNET_SCHEDULER_shutdown'. |
225 | * | 227 | * |
226 | * @param tmppath path for storing temporary data for the test | 228 | * @param testdir only the directory name without any path. This is used for |
227 | * also used to setup the program name for logging | 229 | * all service homes; the directory will be created in a temporary |
230 | * location depending on the underlying OS | ||
228 | * @param cfgfilename name of the configuration file to use; | 231 | * @param cfgfilename name of the configuration file to use; |
229 | * use NULL to only run with defaults | 232 | * use NULL to only run with defaults |
230 | * @param tm main function of the testcase | 233 | * @param tm main function of the testcase |
@@ -232,7 +235,7 @@ typedef void (*GNUNET_TESTING_TestMain)(void *cls, | |||
232 | * @return 0 on success, 1 on error | 235 | * @return 0 on success, 1 on error |
233 | */ | 236 | */ |
234 | int | 237 | int |
235 | GNUNET_TESTING_peer_run (const char *tmppath, | 238 | GNUNET_TESTING_peer_run (const char *testdir, |
236 | const char *cfgfilename, | 239 | const char *cfgfilename, |
237 | GNUNET_TESTING_TestMain tm, | 240 | GNUNET_TESTING_TestMain tm, |
238 | void *tm_cls); | 241 | void *tm_cls); |
@@ -249,8 +252,9 @@ GNUNET_TESTING_peer_run (const char *tmppath, | |||
249 | * This function is useful if the testcase is for a single service | 252 | * This function is useful if the testcase is for a single service |
250 | * and if that service doesn't itself depend on other services. | 253 | * and if that service doesn't itself depend on other services. |
251 | * | 254 | * |
252 | * @param tmppath path for storing temporary data for the test | 255 | * @param testdir only the directory name without any path. This is used for |
253 | * also used to setup the program name for logging | 256 | * all service homes; the directory will be created in a temporary |
257 | * location depending on the underlying OS | ||
254 | * @param service_name name of the service to run | 258 | * @param service_name name of the service to run |
255 | * @param cfgfilename name of the configuration file to use; | 259 | * @param cfgfilename name of the configuration file to use; |
256 | * use NULL to only run with defaults | 260 | * use NULL to only run with defaults |
@@ -259,7 +263,7 @@ GNUNET_TESTING_peer_run (const char *tmppath, | |||
259 | * @return 0 on success, 1 on error | 263 | * @return 0 on success, 1 on error |
260 | */ | 264 | */ |
261 | int | 265 | int |
262 | GNUNET_TESTING_service_run (const char *tmppath, | 266 | GNUNET_TESTING_service_run (const char *testdir, |
263 | const char *service_name, | 267 | const char *service_name, |
264 | const char *cfgfilename, | 268 | const char *cfgfilename, |
265 | GNUNET_TESTING_TestMain tm, | 269 | GNUNET_TESTING_TestMain tm, |