diff options
Diffstat (limited to 'src/testbed/test_testbed_api_test.c')
-rw-r--r-- | src/testbed/test_testbed_api_test.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/testbed/test_testbed_api_test.c b/src/testbed/test_testbed_api_test.c index 7016ad843..4f52d6638 100644 --- a/src/testbed/test_testbed_api_test.c +++ b/src/testbed/test_testbed_api_test.c | |||
@@ -53,12 +53,12 @@ static struct GNUNET_TESTBED_Operation *op; | |||
53 | /** | 53 | /** |
54 | * Abort task identifier | 54 | * Abort task identifier |
55 | */ | 55 | */ |
56 | static GNUNET_SCHEDULER_TaskIdentifier abort_task; | 56 | static struct GNUNET_SCHEDULER_Task * abort_task; |
57 | 57 | ||
58 | /** | 58 | /** |
59 | * shutdown task identifier | 59 | * shutdown task identifier |
60 | */ | 60 | */ |
61 | static GNUNET_SCHEDULER_TaskIdentifier shutdown_task; | 61 | static struct GNUNET_SCHEDULER_Task * shutdown_task; |
62 | 62 | ||
63 | /** | 63 | /** |
64 | * Testing result | 64 | * Testing result |
@@ -75,8 +75,8 @@ static int result; | |||
75 | static void | 75 | static void |
76 | do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 76 | do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
77 | { | 77 | { |
78 | shutdown_task = GNUNET_SCHEDULER_NO_TASK; | 78 | shutdown_task = NULL; |
79 | if (GNUNET_SCHEDULER_NO_TASK != abort_task) | 79 | if (NULL != abort_task) |
80 | GNUNET_SCHEDULER_cancel (abort_task); | 80 | GNUNET_SCHEDULER_cancel (abort_task); |
81 | if (NULL != op) | 81 | if (NULL != op) |
82 | GNUNET_TESTBED_operation_done (op); | 82 | GNUNET_TESTBED_operation_done (op); |
@@ -89,10 +89,10 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
89 | #define FAIL_TEST(cond) do { \ | 89 | #define FAIL_TEST(cond) do { \ |
90 | if (!(cond)) { \ | 90 | if (!(cond)) { \ |
91 | GNUNET_break(0); \ | 91 | GNUNET_break(0); \ |
92 | if (GNUNET_SCHEDULER_NO_TASK != abort_task) \ | 92 | if (NULL != abort_task) \ |
93 | GNUNET_SCHEDULER_cancel (abort_task); \ | 93 | GNUNET_SCHEDULER_cancel (abort_task); \ |
94 | abort_task = GNUNET_SCHEDULER_NO_TASK; \ | 94 | abort_task = NULL; \ |
95 | if (GNUNET_SCHEDULER_NO_TASK == shutdown_task) \ | 95 | if (NULL == shutdown_task) \ |
96 | shutdown_task = GNUNET_SCHEDULER_add_now (do_shutdown, NULL); \ | 96 | shutdown_task = GNUNET_SCHEDULER_add_now (do_shutdown, NULL); \ |
97 | return; \ | 97 | return; \ |
98 | } \ | 98 | } \ |
@@ -109,8 +109,8 @@ static void | |||
109 | do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 109 | do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
110 | { | 110 | { |
111 | LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n"); | 111 | LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n"); |
112 | abort_task = GNUNET_SCHEDULER_NO_TASK; | 112 | abort_task = NULL; |
113 | if (GNUNET_SCHEDULER_NO_TASK != shutdown_task) | 113 | if (NULL != shutdown_task) |
114 | GNUNET_SCHEDULER_cancel (shutdown_task); | 114 | GNUNET_SCHEDULER_cancel (shutdown_task); |
115 | do_shutdown (cls, tc); | 115 | do_shutdown (cls, tc); |
116 | } | 116 | } |