diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-05-06 01:12:57 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-05-06 01:12:57 +0000 |
commit | 9fac6b6eefdc9144053f736fd388cb2199a97046 (patch) | |
tree | 82740a981b7f6ae973d915aa77797acd9db668b2 /src/statistics | |
parent | 23d8d343d5c70481ecf78ec4fafc698907f3e8a9 (diff) | |
download | gnunet-9fac6b6eefdc9144053f736fd388cb2199a97046.tar.gz gnunet-9fac6b6eefdc9144053f736fd388cb2199a97046.zip |
-removing legacy ifdefs, fixing log statements
Diffstat (limited to 'src/statistics')
-rw-r--r-- | src/statistics/test_statistics_api.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/statistics/test_statistics_api.c b/src/statistics/test_statistics_api.c index 0647a4942..84d3f5a23 100644 --- a/src/statistics/test_statistics_api.c +++ b/src/statistics/test_statistics_api.c | |||
@@ -29,7 +29,6 @@ | |||
29 | #include "gnunet_scheduler_lib.h" | 29 | #include "gnunet_scheduler_lib.h" |
30 | #include "gnunet_statistics_service.h" | 30 | #include "gnunet_statistics_service.h" |
31 | 31 | ||
32 | #define DEBUG_STATISTICS GNUNET_EXTRA_LOGGING | ||
33 | 32 | ||
34 | #define START_SERVICE GNUNET_YES | 33 | #define START_SERVICE GNUNET_YES |
35 | 34 | ||
@@ -130,11 +129,7 @@ check () | |||
130 | char *const argv[] = { "test-statistics-api", | 129 | char *const argv[] = { "test-statistics-api", |
131 | "-c", | 130 | "-c", |
132 | "test_statistics_api_data.conf", | 131 | "test_statistics_api_data.conf", |
133 | #if DEBUG_STATISTICS | ||
134 | "-L", "DEBUG", | ||
135 | #else | ||
136 | "-L", "WARNING", | 132 | "-L", "WARNING", |
137 | #endif | ||
138 | NULL | 133 | NULL |
139 | }; | 134 | }; |
140 | struct GNUNET_GETOPT_CommandLineOption options[] = { | 135 | struct GNUNET_GETOPT_CommandLineOption options[] = { |
@@ -146,9 +141,6 @@ check () | |||
146 | proc = | 141 | proc = |
147 | GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-statistics", | 142 | GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-statistics", |
148 | "gnunet-service-statistics", | 143 | "gnunet-service-statistics", |
149 | #if DEBUG_STATISTICS | ||
150 | "-L", "DEBUG", | ||
151 | #endif | ||
152 | "-c", "test_statistics_api_data.conf", NULL); | 144 | "-c", "test_statistics_api_data.conf", NULL); |
153 | #endif | 145 | #endif |
154 | GNUNET_assert (NULL != proc); | 146 | GNUNET_assert (NULL != proc); |
@@ -172,9 +164,6 @@ check () | |||
172 | proc = | 164 | proc = |
173 | GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-statistics", | 165 | GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-statistics", |
174 | "gnunet-service-statistics", | 166 | "gnunet-service-statistics", |
175 | #if DEBUG_STATISTICS | ||
176 | "-L", "DEBUG", | ||
177 | #endif | ||
178 | "-c", "test_statistics_api_data.conf", NULL); | 167 | "-c", "test_statistics_api_data.conf", NULL); |
179 | #endif | 168 | #endif |
180 | GNUNET_PROGRAM_run (5, argv, "test-statistics-api", "nohelp", options, | 169 | GNUNET_PROGRAM_run (5, argv, "test-statistics-api", "nohelp", options, |
@@ -198,11 +187,7 @@ main (int argc, char *argv[]) | |||
198 | int ret; | 187 | int ret; |
199 | 188 | ||
200 | GNUNET_log_setup ("test_statistics_api", | 189 | GNUNET_log_setup ("test_statistics_api", |
201 | #if DEBUG_STATISTICS | ||
202 | "DEBUG", | ||
203 | #else | ||
204 | "WARNING", | 190 | "WARNING", |
205 | #endif | ||
206 | NULL); | 191 | NULL); |
207 | ret = check (); | 192 | ret = check (); |
208 | 193 | ||