diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2012-07-04 13:25:14 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2012-07-04 13:25:14 +0000 |
commit | 15de701534fc172c6622397b6692974f784db3e5 (patch) | |
tree | d27acc8c03cfd09fc2fa75e7b029639199369265 | |
parent | 2d8e7bcaf1656f2ebc75c447c5e2a7fee8664db2 (diff) | |
download | gnunet-15de701534fc172c6622397b6692974f784db3e5.tar.gz gnunet-15de701534fc172c6622397b6692974f784db3e5.zip |
- clean up testss
-rw-r--r-- | src/transport/test_quota_compliance.c | 21 | ||||
-rw-r--r-- | src/transport/test_transport_api.c | 13 | ||||
-rw-r--r-- | src/transport/test_transport_api_bidirectional_connect.c | 7 | ||||
-rw-r--r-- | src/transport/test_transport_api_blacklisting.c | 24 | ||||
-rw-r--r-- | src/transport/test_transport_api_disconnect.c | 22 | ||||
-rw-r--r-- | src/transport/test_transport_api_limited_sockets.c | 13 | ||||
-rw-r--r-- | src/transport/test_transport_api_reliability.c | 25 | ||||
-rw-r--r-- | src/transport/test_transport_api_restart_1peer.c | 13 | ||||
-rw-r--r-- | src/transport/test_transport_api_restart_2peers.c | 12 | ||||
-rw-r--r-- | src/transport/test_transport_api_timeout.c | 14 | ||||
-rw-r--r-- | src/transport/test_transport_api_unreliability.c | 21 | ||||
-rw-r--r-- | src/transport/test_transport_api_unreliability_constant.c | 24 | ||||
-rw-r--r-- | src/transport/test_transport_startonly.c | 21 | ||||
-rw-r--r-- | src/transport/test_transport_testing.c | 3 | ||||
-rw-r--r-- | src/transport/test_transport_testing_restart.c | 1 | ||||
-rw-r--r-- | src/transport/test_transport_testing_startstop.c | 1 |
16 files changed, 1 insertions, 234 deletions
diff --git a/src/transport/test_quota_compliance.c b/src/transport/test_quota_compliance.c index 8f4db5352..ebfbcd5eb 100644 --- a/src/transport/test_quota_compliance.c +++ b/src/transport/test_quota_compliance.c | |||
@@ -24,24 +24,10 @@ | |||
24 | * This test case tests quota compliance both on transport level | 24 | * This test case tests quota compliance both on transport level |
25 | */ | 25 | */ |
26 | #include "platform.h" | 26 | #include "platform.h" |
27 | #include "gnunet_common.h" | ||
28 | #include "gnunet_hello_lib.h" | ||
29 | #include "gnunet_getopt_lib.h" | ||
30 | #include "gnunet_os_lib.h" | ||
31 | #include "gnunet_program_lib.h" | ||
32 | #include "gnunet_scheduler_lib.h" | ||
33 | #include "gnunet_server_lib.h" | ||
34 | #include "gnunet_transport_service.h" | 27 | #include "gnunet_transport_service.h" |
35 | #include "gauger.h" | 28 | #include "gauger.h" |
36 | #include "transport.h" | ||
37 | #include "transport-testing.h" | 29 | #include "transport-testing.h" |
38 | 30 | ||
39 | #define VERBOSE GNUNET_NO | ||
40 | |||
41 | #define VERBOSE_ARM GNUNET_NO | ||
42 | |||
43 | #define START_ARM GNUNET_YES | ||
44 | |||
45 | /** | 31 | /** |
46 | * Testcase timeout | 32 | * Testcase timeout |
47 | */ | 33 | */ |
@@ -564,9 +550,6 @@ check () | |||
564 | static char *argv[] = { "test_transport-quota-compliance", | 550 | static char *argv[] = { "test_transport-quota-compliance", |
565 | "-c", | 551 | "-c", |
566 | "test_quota_compliance_data.conf", | 552 | "test_quota_compliance_data.conf", |
567 | #if VERBOSE | ||
568 | "-L", "DEBUG", | ||
569 | #endif | ||
570 | NULL | 553 | NULL |
571 | }; | 554 | }; |
572 | static struct GNUNET_GETOPT_CommandLineOption options[] = { | 555 | static struct GNUNET_GETOPT_CommandLineOption options[] = { |
@@ -586,11 +569,7 @@ main (int argc, char *argv[]) | |||
586 | GNUNET_TRANSPORT_TESTING_get_test_name (argv[0], &test_name); | 569 | GNUNET_TRANSPORT_TESTING_get_test_name (argv[0], &test_name); |
587 | 570 | ||
588 | GNUNET_log_setup (test_name, | 571 | GNUNET_log_setup (test_name, |
589 | #if VERBOSE | ||
590 | "DEBUG", | ||
591 | #else | ||
592 | "WARNING", | 572 | "WARNING", |
593 | #endif | ||
594 | NULL); | 573 | NULL); |
595 | 574 | ||
596 | GNUNET_TRANSPORT_TESTING_get_test_source_name (__FILE__, &test_source); | 575 | GNUNET_TRANSPORT_TESTING_get_test_source_name (__FILE__, &test_source); |
diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c index f944fac61..1316efe25 100644 --- a/src/transport/test_transport_api.c +++ b/src/transport/test_transport_api.c | |||
@@ -27,19 +27,9 @@ | |||
27 | * C code apparently. | 27 | * C code apparently. |
28 | */ | 28 | */ |
29 | #include "platform.h" | 29 | #include "platform.h" |
30 | #include "gnunet_common.h" | ||
31 | #include "gnunet_hello_lib.h" | ||
32 | #include "gnunet_getopt_lib.h" | ||
33 | #include "gnunet_os_lib.h" | ||
34 | #include "gnunet_program_lib.h" | ||
35 | #include "gnunet_scheduler_lib.h" | ||
36 | #include "gnunet_transport_service.h" | 30 | #include "gnunet_transport_service.h" |
37 | #include "transport.h" | ||
38 | #include "transport-testing.h" | 31 | #include "transport-testing.h" |
39 | 32 | ||
40 | |||
41 | #define START_ARM GNUNET_YES | ||
42 | |||
43 | /** | 33 | /** |
44 | * How long until we give up on transmitting the message? | 34 | * How long until we give up on transmitting the message? |
45 | */ | 35 | */ |
@@ -383,9 +373,6 @@ check () | |||
383 | GNUNET_GETOPT_OPTION_END | 373 | GNUNET_GETOPT_OPTION_END |
384 | }; | 374 | }; |
385 | 375 | ||
386 | #if WRITECONFIG | ||
387 | setTransportOptions ("test_transport_api_data.conf"); | ||
388 | #endif | ||
389 | send_task = GNUNET_SCHEDULER_NO_TASK; | 376 | send_task = GNUNET_SCHEDULER_NO_TASK; |
390 | 377 | ||
391 | ok = 1; | 378 | ok = 1; |
diff --git a/src/transport/test_transport_api_bidirectional_connect.c b/src/transport/test_transport_api_bidirectional_connect.c index 2c4eeab3c..39232160f 100644 --- a/src/transport/test_transport_api_bidirectional_connect.c +++ b/src/transport/test_transport_api_bidirectional_connect.c | |||
@@ -25,14 +25,7 @@ | |||
25 | * (almost) the same time | 25 | * (almost) the same time |
26 | */ | 26 | */ |
27 | #include "platform.h" | 27 | #include "platform.h" |
28 | #include "gnunet_common.h" | ||
29 | #include "gnunet_hello_lib.h" | ||
30 | #include "gnunet_getopt_lib.h" | ||
31 | #include "gnunet_os_lib.h" | ||
32 | #include "gnunet_program_lib.h" | ||
33 | #include "gnunet_scheduler_lib.h" | ||
34 | #include "gnunet_transport_service.h" | 28 | #include "gnunet_transport_service.h" |
35 | #include "transport.h" | ||
36 | #include "transport-testing.h" | 29 | #include "transport-testing.h" |
37 | 30 | ||
38 | 31 | ||
diff --git a/src/transport/test_transport_api_blacklisting.c b/src/transport/test_transport_api_blacklisting.c index 909ea57d4..55adb5b10 100644 --- a/src/transport/test_transport_api_blacklisting.c +++ b/src/transport/test_transport_api_blacklisting.c | |||
@@ -25,22 +25,9 @@ | |||
25 | * | 25 | * |
26 | */ | 26 | */ |
27 | #include "platform.h" | 27 | #include "platform.h" |
28 | #include "gnunet_common.h" | ||
29 | #include "gnunet_hello_lib.h" | ||
30 | #include "gnunet_getopt_lib.h" | ||
31 | #include "gnunet_os_lib.h" | ||
32 | #include "gnunet_program_lib.h" | ||
33 | #include "gnunet_scheduler_lib.h" | ||
34 | #include "gnunet_transport_service.h" | 28 | #include "gnunet_transport_service.h" |
35 | #include "transport.h" | ||
36 | #include "transport-testing.h" | 29 | #include "transport-testing.h" |
37 | 30 | ||
38 | #define VERBOSE GNUNET_NO | ||
39 | #define VERBOSE_ARM GNUNET_NO | ||
40 | |||
41 | #define START_ARM GNUNET_YES | ||
42 | |||
43 | |||
44 | struct PeerContext *p1; | 31 | struct PeerContext *p1; |
45 | 32 | ||
46 | struct PeerContext *p2; | 33 | struct PeerContext *p2; |
@@ -435,19 +422,12 @@ check () | |||
435 | static char *const argv[] = { "test-transport-api-blacklisting", | 422 | static char *const argv[] = { "test-transport-api-blacklisting", |
436 | "-c", | 423 | "-c", |
437 | "test_transport_api_data.conf", | 424 | "test_transport_api_data.conf", |
438 | #if VERBOSE | ||
439 | "-L", "DEBUG", | ||
440 | #endif | ||
441 | NULL | 425 | NULL |
442 | }; | 426 | }; |
443 | static struct GNUNET_GETOPT_CommandLineOption options[] = { | 427 | static struct GNUNET_GETOPT_CommandLineOption options[] = { |
444 | GNUNET_GETOPT_OPTION_END | 428 | GNUNET_GETOPT_OPTION_END |
445 | }; | 429 | }; |
446 | 430 | ||
447 | #if WRITECONFIG | ||
448 | setTransportOptions ("test_transport_api_data.conf"); | ||
449 | #endif | ||
450 | |||
451 | ok = 1; | 431 | ok = 1; |
452 | GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, "test-transport-api-blacklisting", | 432 | GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, "test-transport-api-blacklisting", |
453 | "nohelp", options, &run, &ok); | 433 | "nohelp", options, &run, &ok); |
@@ -461,11 +441,7 @@ main (int argc, char *argv[]) | |||
461 | int ret; | 441 | int ret; |
462 | 442 | ||
463 | GNUNET_log_setup ("test-transport-api-blacklisting", | 443 | GNUNET_log_setup ("test-transport-api-blacklisting", |
464 | #if VERBOSE | ||
465 | "DEBUG", | ||
466 | #else | ||
467 | "WARNING", | 444 | "WARNING", |
468 | #endif | ||
469 | NULL); | 445 | NULL); |
470 | 446 | ||
471 | tth = GNUNET_TRANSPORT_TESTING_init (); | 447 | tth = GNUNET_TRANSPORT_TESTING_init (); |
diff --git a/src/transport/test_transport_api_disconnect.c b/src/transport/test_transport_api_disconnect.c index 973c4cfbc..7a26c7eae 100644 --- a/src/transport/test_transport_api_disconnect.c +++ b/src/transport/test_transport_api_disconnect.c | |||
@@ -24,21 +24,9 @@ | |||
24 | * This test case tests disconnect notifications in peer shutdown | 24 | * This test case tests disconnect notifications in peer shutdown |
25 | */ | 25 | */ |
26 | #include "platform.h" | 26 | #include "platform.h" |
27 | #include "gnunet_common.h" | ||
28 | #include "gnunet_hello_lib.h" | ||
29 | #include "gnunet_getopt_lib.h" | ||
30 | #include "gnunet_os_lib.h" | ||
31 | #include "gnunet_program_lib.h" | ||
32 | #include "gnunet_scheduler_lib.h" | ||
33 | #include "gnunet_transport_service.h" | 27 | #include "gnunet_transport_service.h" |
34 | #include "transport.h" | ||
35 | #include "transport-testing.h" | 28 | #include "transport-testing.h" |
36 | 29 | ||
37 | #define VERBOSE GNUNET_NO | ||
38 | #define VERBOSE_ARM GNUNET_NO | ||
39 | |||
40 | #define START_ARM GNUNET_YES | ||
41 | |||
42 | /** | 30 | /** |
43 | * How long until we give up on transmitting the message? | 31 | * How long until we give up on transmitting the message? |
44 | */ | 32 | */ |
@@ -374,18 +362,12 @@ check () | |||
374 | static char *const argv[] = { "test-transport-api", | 362 | static char *const argv[] = { "test-transport-api", |
375 | "-c", | 363 | "-c", |
376 | "test_transport_api_data.conf", | 364 | "test_transport_api_data.conf", |
377 | #if VERBOSE | ||
378 | "-L", "DEBUG", | ||
379 | #endif | ||
380 | NULL | 365 | NULL |
381 | }; | 366 | }; |
382 | static struct GNUNET_GETOPT_CommandLineOption options[] = { | 367 | static struct GNUNET_GETOPT_CommandLineOption options[] = { |
383 | GNUNET_GETOPT_OPTION_END | 368 | GNUNET_GETOPT_OPTION_END |
384 | }; | 369 | }; |
385 | 370 | ||
386 | #if WRITECONFIG | ||
387 | setTransportOptions ("test_transport_api_data.conf"); | ||
388 | #endif | ||
389 | send_task = GNUNET_SCHEDULER_NO_TASK; | 371 | send_task = GNUNET_SCHEDULER_NO_TASK; |
390 | 372 | ||
391 | ok = 1; | 373 | ok = 1; |
@@ -403,11 +385,7 @@ main (int argc, char *argv[]) | |||
403 | GNUNET_TRANSPORT_TESTING_get_test_name (argv[0], &test_name); | 385 | GNUNET_TRANSPORT_TESTING_get_test_name (argv[0], &test_name); |
404 | 386 | ||
405 | GNUNET_log_setup (test_name, | 387 | GNUNET_log_setup (test_name, |
406 | #if VERBOSE | ||
407 | "DEBUG", | ||
408 | #else | ||
409 | "WARNING", | 388 | "WARNING", |
410 | #endif | ||
411 | NULL); | 389 | NULL); |
412 | 390 | ||
413 | GNUNET_TRANSPORT_TESTING_get_test_source_name (__FILE__, &test_source); | 391 | GNUNET_TRANSPORT_TESTING_get_test_source_name (__FILE__, &test_source); |
diff --git a/src/transport/test_transport_api_limited_sockets.c b/src/transport/test_transport_api_limited_sockets.c index cd143aebe..c605a3182 100644 --- a/src/transport/test_transport_api_limited_sockets.c +++ b/src/transport/test_transport_api_limited_sockets.c | |||
@@ -27,22 +27,9 @@ | |||
27 | * C code apparently. | 27 | * C code apparently. |
28 | */ | 28 | */ |
29 | #include "platform.h" | 29 | #include "platform.h" |
30 | #include "gnunet_common.h" | ||
31 | #include "gnunet_hello_lib.h" | ||
32 | #include "gnunet_getopt_lib.h" | ||
33 | #include "gnunet_os_lib.h" | ||
34 | #include "gnunet_program_lib.h" | ||
35 | #include "gnunet_scheduler_lib.h" | ||
36 | #include "gnunet_transport_service.h" | 30 | #include "gnunet_transport_service.h" |
37 | #include "transport.h" | ||
38 | #include "transport-testing.h" | 31 | #include "transport-testing.h" |
39 | 32 | ||
40 | #define VERBOSE GNUNET_NO | ||
41 | |||
42 | #define VERBOSE_ARM GNUNET_NO | ||
43 | |||
44 | #define START_ARM GNUNET_YES | ||
45 | |||
46 | /** | 33 | /** |
47 | * How long until we give up on transmitting the message? | 34 | * How long until we give up on transmitting the message? |
48 | */ | 35 | */ |
diff --git a/src/transport/test_transport_api_reliability.c b/src/transport/test_transport_api_reliability.c index 759241c52..bef2d0ffe 100644 --- a/src/transport/test_transport_api_reliability.c +++ b/src/transport/test_transport_api_reliability.c | |||
@@ -26,24 +26,9 @@ | |||
26 | * achieve reliable message delivery. | 26 | * achieve reliable message delivery. |
27 | */ | 27 | */ |
28 | #include "platform.h" | 28 | #include "platform.h" |
29 | #include "gnunet_common.h" | ||
30 | #include "gnunet_hello_lib.h" | ||
31 | #include "gnunet_getopt_lib.h" | ||
32 | #include "gnunet_os_lib.h" | ||
33 | #include "gnunet_program_lib.h" | ||
34 | #include "gnunet_scheduler_lib.h" | ||
35 | #include "gnunet_server_lib.h" | ||
36 | #include "gnunet_transport_service.h" | 29 | #include "gnunet_transport_service.h" |
37 | #include "gauger.h" | 30 | #include "gauger.h" |
38 | #include "transport.h" | ||
39 | #include "transport-testing.h" | 31 | #include "transport-testing.h" |
40 | |||
41 | #define VERBOSE GNUNET_NO | ||
42 | |||
43 | #define VERBOSE_ARM GNUNET_NO | ||
44 | |||
45 | #define START_ARM GNUNET_YES | ||
46 | |||
47 | /** | 32 | /** |
48 | * Testcase timeout | 33 | * Testcase timeout |
49 | */ | 34 | */ |
@@ -479,18 +464,12 @@ check () | |||
479 | static char *argv[] = { "test_transport", | 464 | static char *argv[] = { "test_transport", |
480 | "-c", | 465 | "-c", |
481 | "test_transport_api_data.conf", | 466 | "test_transport_api_data.conf", |
482 | #if VERBOSE | ||
483 | "-L", "DEBUG", | ||
484 | #endif | ||
485 | NULL | 467 | NULL |
486 | }; | 468 | }; |
487 | static struct GNUNET_GETOPT_CommandLineOption options[] = { | 469 | static struct GNUNET_GETOPT_CommandLineOption options[] = { |
488 | GNUNET_GETOPT_OPTION_END | 470 | GNUNET_GETOPT_OPTION_END |
489 | }; | 471 | }; |
490 | 472 | ||
491 | #if WRITECONFIG | ||
492 | setTransportOptions ("test_transport_api_data.conf"); | ||
493 | #endif | ||
494 | ok = 1; | 473 | ok = 1; |
495 | GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, test_name, | 474 | GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, test_name, |
496 | "nohelp", options, &run, &ok); | 475 | "nohelp", options, &run, &ok); |
@@ -506,11 +485,7 @@ main (int argc, char *argv[]) | |||
506 | GNUNET_TRANSPORT_TESTING_get_test_name (argv[0], &test_name); | 485 | GNUNET_TRANSPORT_TESTING_get_test_name (argv[0], &test_name); |
507 | 486 | ||
508 | GNUNET_log_setup (test_name, | 487 | GNUNET_log_setup (test_name, |
509 | #if VERBOSE | ||
510 | "DEBUG", | ||
511 | #else | ||
512 | "WARNING", | 488 | "WARNING", |
513 | #endif | ||
514 | NULL); | 489 | NULL); |
515 | 490 | ||
516 | GNUNET_TRANSPORT_TESTING_get_test_source_name (__FILE__, &test_source); | 491 | GNUNET_TRANSPORT_TESTING_get_test_source_name (__FILE__, &test_source); |
diff --git a/src/transport/test_transport_api_restart_1peer.c b/src/transport/test_transport_api_restart_1peer.c index b7fc7ab30..5f8f97b75 100644 --- a/src/transport/test_transport_api_restart_1peer.c +++ b/src/transport/test_transport_api_restart_1peer.c | |||
@@ -26,19 +26,9 @@ | |||
26 | * C code apparently. | 26 | * C code apparently. |
27 | */ | 27 | */ |
28 | #include "platform.h" | 28 | #include "platform.h" |
29 | #include "gnunet_common.h" | ||
30 | #include "gnunet_hello_lib.h" | ||
31 | #include "gnunet_getopt_lib.h" | ||
32 | #include "gnunet_os_lib.h" | ||
33 | #include "gnunet_program_lib.h" | ||
34 | #include "gnunet_scheduler_lib.h" | ||
35 | #include "gnunet_transport_service.h" | 29 | #include "gnunet_transport_service.h" |
36 | #include "transport.h" | ||
37 | #include "transport-testing.h" | 30 | #include "transport-testing.h" |
38 | 31 | ||
39 | |||
40 | #define START_ARM GNUNET_YES | ||
41 | |||
42 | /** | 32 | /** |
43 | * How long until we give up on transmitting the message? | 33 | * How long until we give up on transmitting the message? |
44 | */ | 34 | */ |
@@ -437,9 +427,6 @@ check () | |||
437 | GNUNET_GETOPT_OPTION_END | 427 | GNUNET_GETOPT_OPTION_END |
438 | }; | 428 | }; |
439 | 429 | ||
440 | #if WRITECONFIG | ||
441 | setTransportOptions ("test_transport_api_data.conf"); | ||
442 | #endif | ||
443 | send_task = GNUNET_SCHEDULER_NO_TASK; | 430 | send_task = GNUNET_SCHEDULER_NO_TASK; |
444 | 431 | ||
445 | ok = 1; | 432 | ok = 1; |
diff --git a/src/transport/test_transport_api_restart_2peers.c b/src/transport/test_transport_api_restart_2peers.c index 1d7790c9f..bdf14744f 100644 --- a/src/transport/test_transport_api_restart_2peers.c +++ b/src/transport/test_transport_api_restart_2peers.c | |||
@@ -26,18 +26,9 @@ | |||
26 | * C code apparently. | 26 | * C code apparently. |
27 | */ | 27 | */ |
28 | #include "platform.h" | 28 | #include "platform.h" |
29 | #include "gnunet_common.h" | ||
30 | #include "gnunet_hello_lib.h" | ||
31 | #include "gnunet_getopt_lib.h" | ||
32 | #include "gnunet_os_lib.h" | ||
33 | #include "gnunet_program_lib.h" | ||
34 | #include "gnunet_scheduler_lib.h" | ||
35 | #include "gnunet_transport_service.h" | 29 | #include "gnunet_transport_service.h" |
36 | #include "transport.h" | ||
37 | #include "transport-testing.h" | 30 | #include "transport-testing.h" |
38 | 31 | ||
39 | #define START_ARM GNUNET_YES | ||
40 | |||
41 | /** | 32 | /** |
42 | * How long until we give up on transmitting the message? | 33 | * How long until we give up on transmitting the message? |
43 | */ | 34 | */ |
@@ -417,9 +408,6 @@ check () | |||
417 | GNUNET_GETOPT_OPTION_END | 408 | GNUNET_GETOPT_OPTION_END |
418 | }; | 409 | }; |
419 | 410 | ||
420 | #if WRITECONFIG | ||
421 | setTransportOptions ("test_transport_api_data.conf"); | ||
422 | #endif | ||
423 | send_task = GNUNET_SCHEDULER_NO_TASK; | 411 | send_task = GNUNET_SCHEDULER_NO_TASK; |
424 | 412 | ||
425 | ok = 1; | 413 | ok = 1; |
diff --git a/src/transport/test_transport_api_timeout.c b/src/transport/test_transport_api_timeout.c index 8b92dce1e..264573937 100644 --- a/src/transport/test_transport_api_timeout.c +++ b/src/transport/test_transport_api_timeout.c | |||
@@ -28,20 +28,9 @@ | |||
28 | */ | 28 | */ |
29 | 29 | ||
30 | #include "platform.h" | 30 | #include "platform.h" |
31 | #include "gnunet_common.h" | ||
32 | #include "gnunet_hello_lib.h" | ||
33 | #include "gnunet_getopt_lib.h" | ||
34 | #include "gnunet_os_lib.h" | ||
35 | #include "gnunet_program_lib.h" | ||
36 | #include "gnunet_scheduler_lib.h" | ||
37 | #include "gnunet_transport_service.h" | 31 | #include "gnunet_transport_service.h" |
38 | #include "transport.h" | ||
39 | #include "transport-testing.h" | 32 | #include "transport-testing.h" |
40 | 33 | ||
41 | #define VERBOSE GNUNET_NO | ||
42 | |||
43 | #define START_ARM GNUNET_YES | ||
44 | |||
45 | /** | 34 | /** |
46 | * How long until we give up on transmitting the message? | 35 | * How long until we give up on transmitting the message? |
47 | */ | 36 | */ |
@@ -305,9 +294,6 @@ check () | |||
305 | GNUNET_GETOPT_OPTION_END | 294 | GNUNET_GETOPT_OPTION_END |
306 | }; | 295 | }; |
307 | 296 | ||
308 | #if WRITECONFIG | ||
309 | setTransportOptions ("test_transport_api_data.conf"); | ||
310 | #endif | ||
311 | timer_task = GNUNET_SCHEDULER_NO_TASK; | 297 | timer_task = GNUNET_SCHEDULER_NO_TASK; |
312 | 298 | ||
313 | ok = 1; | 299 | ok = 1; |
diff --git a/src/transport/test_transport_api_unreliability.c b/src/transport/test_transport_api_unreliability.c index 53de91ab1..56e609e92 100644 --- a/src/transport/test_transport_api_unreliability.c +++ b/src/transport/test_transport_api_unreliability.c | |||
@@ -27,24 +27,10 @@ | |||
27 | * achieve reliable message delivery. | 27 | * achieve reliable message delivery. |
28 | */ | 28 | */ |
29 | #include "platform.h" | 29 | #include "platform.h" |
30 | #include "gnunet_common.h" | ||
31 | #include "gnunet_hello_lib.h" | ||
32 | #include "gnunet_getopt_lib.h" | ||
33 | #include "gnunet_os_lib.h" | ||
34 | #include "gnunet_program_lib.h" | ||
35 | #include "gnunet_scheduler_lib.h" | ||
36 | #include "gnunet_server_lib.h" | ||
37 | #include "gnunet_transport_service.h" | 30 | #include "gnunet_transport_service.h" |
38 | #include "gauger.h" | 31 | #include "gauger.h" |
39 | #include "transport.h" | ||
40 | #include "transport-testing.h" | 32 | #include "transport-testing.h" |
41 | 33 | ||
42 | #define VERBOSE GNUNET_NO | ||
43 | |||
44 | #define VERBOSE_ARM GNUNET_NO | ||
45 | |||
46 | #define START_ARM GNUNET_YES | ||
47 | |||
48 | /** | 34 | /** |
49 | * Testcase timeout | 35 | * Testcase timeout |
50 | */ | 36 | */ |
@@ -525,9 +511,6 @@ check () | |||
525 | static char *const argv[] = { "test-transport-api-unreliability", | 511 | static char *const argv[] = { "test-transport-api-unreliability", |
526 | "-c", | 512 | "-c", |
527 | "test_transport_api_data.conf", | 513 | "test_transport_api_data.conf", |
528 | #if VERBOSE | ||
529 | "-L", "DEBUG", | ||
530 | #endif | ||
531 | NULL | 514 | NULL |
532 | }; | 515 | }; |
533 | static struct GNUNET_GETOPT_CommandLineOption options[] = { | 516 | static struct GNUNET_GETOPT_CommandLineOption options[] = { |
@@ -553,11 +536,7 @@ main (int argc, char *argv[]) | |||
553 | GNUNET_TRANSPORT_TESTING_get_test_name (argv[0], &test_name); | 536 | GNUNET_TRANSPORT_TESTING_get_test_name (argv[0], &test_name); |
554 | 537 | ||
555 | GNUNET_log_setup (test_name, | 538 | GNUNET_log_setup (test_name, |
556 | #if VERBOSE | ||
557 | "DEBUG", | ||
558 | #else | ||
559 | "WARNING", | 539 | "WARNING", |
560 | #endif | ||
561 | NULL); | 540 | NULL); |
562 | 541 | ||
563 | GNUNET_TRANSPORT_TESTING_get_test_source_name (__FILE__, &test_source); | 542 | GNUNET_TRANSPORT_TESTING_get_test_source_name (__FILE__, &test_source); |
diff --git a/src/transport/test_transport_api_unreliability_constant.c b/src/transport/test_transport_api_unreliability_constant.c index fb72b0f1c..cb24675c1 100644 --- a/src/transport/test_transport_api_unreliability_constant.c +++ b/src/transport/test_transport_api_unreliability_constant.c | |||
@@ -27,24 +27,10 @@ | |||
27 | * achieve reliable message delivery. | 27 | * achieve reliable message delivery. |
28 | */ | 28 | */ |
29 | #include "platform.h" | 29 | #include "platform.h" |
30 | #include "gnunet_common.h" | ||
31 | #include "gnunet_hello_lib.h" | ||
32 | #include "gnunet_getopt_lib.h" | ||
33 | #include "gnunet_os_lib.h" | ||
34 | #include "gnunet_program_lib.h" | ||
35 | #include "gnunet_scheduler_lib.h" | ||
36 | #include "gnunet_server_lib.h" | ||
37 | #include "gnunet_transport_service.h" | 30 | #include "gnunet_transport_service.h" |
38 | #include "gauger.h" | 31 | #include "gauger.h" |
39 | #include "transport.h" | ||
40 | #include "transport-testing.h" | 32 | #include "transport-testing.h" |
41 | 33 | ||
42 | #define VERBOSE GNUNET_NO | ||
43 | |||
44 | #define VERBOSE_ARM GNUNET_NO | ||
45 | |||
46 | #define START_ARM GNUNET_YES | ||
47 | |||
48 | /** | 34 | /** |
49 | * Testcase timeout | 35 | * Testcase timeout |
50 | */ | 36 | */ |
@@ -464,18 +450,12 @@ check () | |||
464 | static char *const argv[] = { "test-transport-api-unreliability-constant", | 450 | static char *const argv[] = { "test-transport-api-unreliability-constant", |
465 | "-c", | 451 | "-c", |
466 | "test_transport_api_data.conf", | 452 | "test_transport_api_data.conf", |
467 | #if VERBOSE | ||
468 | "-L", "DEBUG", | ||
469 | #endif | ||
470 | NULL | 453 | NULL |
471 | }; | 454 | }; |
472 | static struct GNUNET_GETOPT_CommandLineOption options[] = { | 455 | static struct GNUNET_GETOPT_CommandLineOption options[] = { |
473 | GNUNET_GETOPT_OPTION_END | 456 | GNUNET_GETOPT_OPTION_END |
474 | }; | 457 | }; |
475 | 458 | ||
476 | #if WRITECONFIG | ||
477 | setTransportOptions ("test_transport_api_data.conf"); | ||
478 | #endif | ||
479 | ok = GNUNET_SYSERR; | 459 | ok = GNUNET_SYSERR; |
480 | 460 | ||
481 | GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, test_name, | 461 | GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, test_name, |
@@ -492,11 +472,7 @@ main (int argc, char *argv[]) | |||
492 | GNUNET_TRANSPORT_TESTING_get_test_name (argv[0], &test_name); | 472 | GNUNET_TRANSPORT_TESTING_get_test_name (argv[0], &test_name); |
493 | 473 | ||
494 | GNUNET_log_setup (test_name, | 474 | GNUNET_log_setup (test_name, |
495 | #if VERBOSE | ||
496 | "DEBUG", | ||
497 | #else | ||
498 | "WARNING", | 475 | "WARNING", |
499 | #endif | ||
500 | NULL); | 476 | NULL); |
501 | 477 | ||
502 | GNUNET_TRANSPORT_TESTING_get_test_source_name (__FILE__, &test_source); | 478 | GNUNET_TRANSPORT_TESTING_get_test_source_name (__FILE__, &test_source); |
diff --git a/src/transport/test_transport_startonly.c b/src/transport/test_transport_startonly.c index 79578ab53..0f3e88b1f 100644 --- a/src/transport/test_transport_startonly.c +++ b/src/transport/test_transport_startonly.c | |||
@@ -27,22 +27,9 @@ | |||
27 | * C code apparently. | 27 | * C code apparently. |
28 | */ | 28 | */ |
29 | #include "platform.h" | 29 | #include "platform.h" |
30 | #include "gnunet_common.h" | ||
31 | #include "gnunet_hello_lib.h" | ||
32 | #include "gnunet_getopt_lib.h" | ||
33 | #include "gnunet_os_lib.h" | ||
34 | #include "gnunet_program_lib.h" | ||
35 | #include "gnunet_scheduler_lib.h" | ||
36 | #include "gnunet_transport_service.h" | 30 | #include "gnunet_transport_service.h" |
37 | #include "transport.h" | ||
38 | #include "transport-testing.h" | 31 | #include "transport-testing.h" |
39 | 32 | ||
40 | #define VERBOSE GNUNET_NO | ||
41 | |||
42 | #define VERBOSE_ARM GNUNET_NO | ||
43 | |||
44 | #define START_ARM GNUNET_YES | ||
45 | |||
46 | /** | 33 | /** |
47 | * How long until we give up on transmitting the message? | 34 | * How long until we give up on transmitting the message? |
48 | */ | 35 | */ |
@@ -160,19 +147,13 @@ int | |||
160 | main (int argc, char *argv[]) | 147 | main (int argc, char *argv[]) |
161 | { | 148 | { |
162 | GNUNET_log_setup ("test_transport_testing", | 149 | GNUNET_log_setup ("test_transport_testing", |
163 | #if VERBOSE | ||
164 | "DEBUG", | ||
165 | #else | ||
166 | "WARNING", | 150 | "WARNING", |
167 | #endif | 151 | |
168 | NULL); | 152 | NULL); |
169 | 153 | ||
170 | char *const argv_1[] = { "test_transport_testing", | 154 | char *const argv_1[] = { "test_transport_testing", |
171 | "-c", | 155 | "-c", |
172 | "test_transport_api_data.conf", | 156 | "test_transport_api_data.conf", |
173 | #if VERBOSE | ||
174 | "-L", "DEBUG", | ||
175 | #endif | ||
176 | NULL | 157 | NULL |
177 | }; | 158 | }; |
178 | 159 | ||
diff --git a/src/transport/test_transport_testing.c b/src/transport/test_transport_testing.c index 7b04d9370..7875f1cfa 100644 --- a/src/transport/test_transport_testing.c +++ b/src/transport/test_transport_testing.c | |||
@@ -27,9 +27,6 @@ | |||
27 | * C code apparently. | 27 | * C code apparently. |
28 | */ | 28 | */ |
29 | #include "platform.h" | 29 | #include "platform.h" |
30 | #include "gnunet_common.h" | ||
31 | #include "gnunet_hello_lib.h" | ||
32 | #include "gnunet_scheduler_lib.h" | ||
33 | #include "gnunet_transport_service.h" | 30 | #include "gnunet_transport_service.h" |
34 | #include "transport-testing.h" | 31 | #include "transport-testing.h" |
35 | /** | 32 | /** |
diff --git a/src/transport/test_transport_testing_restart.c b/src/transport/test_transport_testing_restart.c index ed7b2f5c1..8ca18f982 100644 --- a/src/transport/test_transport_testing_restart.c +++ b/src/transport/test_transport_testing_restart.c | |||
@@ -24,7 +24,6 @@ | |||
24 | * | 24 | * |
25 | */ | 25 | */ |
26 | #include "platform.h" | 26 | #include "platform.h" |
27 | #include "gnunet_common.h" | ||
28 | #include "gnunet_transport_service.h" | 27 | #include "gnunet_transport_service.h" |
29 | #include "transport-testing.h" | 28 | #include "transport-testing.h" |
30 | 29 | ||
diff --git a/src/transport/test_transport_testing_startstop.c b/src/transport/test_transport_testing_startstop.c index e1c370627..22a4e5148 100644 --- a/src/transport/test_transport_testing_startstop.c +++ b/src/transport/test_transport_testing_startstop.c | |||
@@ -24,7 +24,6 @@ | |||
24 | * | 24 | * |
25 | */ | 25 | */ |
26 | #include "platform.h" | 26 | #include "platform.h" |
27 | #include "gnunet_common.h" | ||
28 | #include "gnunet_transport_service.h" | 27 | #include "gnunet_transport_service.h" |
29 | #include "transport-testing.h" | 28 | #include "transport-testing.h" |
30 | 29 | ||