diff options
Diffstat (limited to 'src/testbed/test_testbed_api_cmd_netjail.c')
-rw-r--r-- | src/testbed/test_testbed_api_cmd_netjail.c | 35 |
1 files changed, 10 insertions, 25 deletions
diff --git a/src/testbed/test_testbed_api_cmd_netjail.c b/src/testbed/test_testbed_api_cmd_netjail.c index d29ebdcb4..e5fc0877e 100644 --- a/src/testbed/test_testbed_api_cmd_netjail.c +++ b/src/testbed/test_testbed_api_cmd_netjail.c | |||
@@ -28,22 +28,6 @@ | |||
28 | #include "gnunet_testbed_ng_service.h" | 28 | #include "gnunet_testbed_ng_service.h" |
29 | #include "gnunet_util_lib.h" | 29 | #include "gnunet_util_lib.h" |
30 | 30 | ||
31 | #define HELPER_TESTBED_BINARY "../testbed/gnunet-helper-testbed" | ||
32 | |||
33 | static int | ||
34 | tokenizer_cb (void *cls, const struct GNUNET_MessageHeader *message) | ||
35 | { | ||
36 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Called tokenizer.\n"); | ||
37 | return GNUNET_OK; | ||
38 | } | ||
39 | |||
40 | |||
41 | static void | ||
42 | exp_cb (void *cls) | ||
43 | { | ||
44 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Called exp_cb.\n"); | ||
45 | } | ||
46 | |||
47 | 31 | ||
48 | /** | 32 | /** |
49 | * Main function to run the test cases. | 33 | * Main function to run the test cases. |
@@ -54,20 +38,19 @@ exp_cb (void *cls) | |||
54 | static void | 38 | static void |
55 | run (void *cls) | 39 | run (void *cls) |
56 | { | 40 | { |
57 | char *const binary_argv[3] = {HELPER_TESTBED_BINARY, NULL}; | ||
58 | |||
59 | struct GNUNET_TESTING_Command commands[] = { | 41 | struct GNUNET_TESTING_Command commands[] = { |
60 | GNUNET_TESTBED_cmd_netjail_start ("netjail-start-1", | 42 | GNUNET_TESTBED_cmd_netjail_start ("netjail-start-1", |
61 | "1", | 43 | "2", |
62 | "2"), | 44 | "2"), |
63 | GNUNET_TESTBED_cmd_netjail_start_testbed ("netjail-exec-1", | 45 | GNUNET_TESTBED_cmd_netjail_start_testbed ("netjail-start-testbed-1", |
64 | binary_argv, | ||
65 | "1", | ||
66 | "2", | 46 | "2", |
67 | &tokenizer_cb, | 47 | "2"), |
68 | &exp_cb), | 48 | GNUNET_TESTBED_cmd_stop_testbed ("stop-testbed", |
49 | "netjail-start-testbed-1", | ||
50 | "2", | ||
51 | "2"), | ||
69 | GNUNET_TESTBED_cmd_netjail_stop ("netjail-stop-1", | 52 | GNUNET_TESTBED_cmd_netjail_stop ("netjail-stop-1", |
70 | "1", | 53 | "2", |
71 | "2"), | 54 | "2"), |
72 | GNUNET_TESTING_cmd_end () | 55 | GNUNET_TESTING_cmd_end () |
73 | }; | 56 | }; |
@@ -90,5 +73,7 @@ main (int argc, | |||
90 | GNUNET_SCHEDULER_run (&run, | 73 | GNUNET_SCHEDULER_run (&run, |
91 | NULL); | 74 | NULL); |
92 | 75 | ||
76 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
77 | "Test finished!\n"); | ||
93 | return rv; | 78 | return rv; |
94 | } | 79 | } |