diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-02-02 12:06:23 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-02-02 12:06:23 +0000 |
commit | 53d0e2a26886c03a7d92cb400da9ddf5cb841d65 (patch) | |
tree | 18c8ce2f9cb27a44665e826427518392753d7648 /src | |
parent | 9b7ad6f345208cae41ec4ebf957528fc43406a84 (diff) | |
download | gnunet-53d0e2a26886c03a7d92cb400da9ddf5cb841d65.tar.gz gnunet-53d0e2a26886c03a7d92cb400da9ddf5cb841d65.zip |
fixes
Diffstat (limited to 'src')
-rw-r--r-- | src/core/test_core_api.c | 6 | ||||
-rw-r--r-- | src/core/test_core_api_peer1.conf | 8 | ||||
-rw-r--r-- | src/core/test_core_api_peer2.conf | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/core/test_core_api.c b/src/core/test_core_api.c index bb3a0d586..c931fccc2 100644 --- a/src/core/test_core_api.c +++ b/src/core/test_core_api.c | |||
@@ -34,7 +34,7 @@ | |||
34 | #include "gnunet_scheduler_lib.h" | 34 | #include "gnunet_scheduler_lib.h" |
35 | #include "gnunet_transport_service.h" | 35 | #include "gnunet_transport_service.h" |
36 | 36 | ||
37 | #define VERBOSE GNUNET_NO | 37 | #define VERBOSE GNUNET_YES |
38 | 38 | ||
39 | #define START_ARM GNUNET_YES | 39 | #define START_ARM GNUNET_YES |
40 | 40 | ||
@@ -42,7 +42,7 @@ | |||
42 | /** | 42 | /** |
43 | * How long until we give up on transmitting the message? | 43 | * How long until we give up on transmitting the message? |
44 | */ | 44 | */ |
45 | #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60) | 45 | #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 6) |
46 | 46 | ||
47 | #define MTYPE 12345 | 47 | #define MTYPE 12345 |
48 | 48 | ||
@@ -192,7 +192,7 @@ transmit_ready (void *cls, size_t size, void *buf) | |||
192 | m->size = htons (sizeof (struct GNUNET_MessageHeader)); | 192 | m->size = htons (sizeof (struct GNUNET_MessageHeader)); |
193 | err_task = | 193 | err_task = |
194 | GNUNET_SCHEDULER_add_delayed (sched, | 194 | GNUNET_SCHEDULER_add_delayed (sched, |
195 | GNUNET_TIME_UNIT_MINUTES, &terminate_task_error, NULL); | 195 | TIMEOUT, &terminate_task_error, NULL); |
196 | 196 | ||
197 | return sizeof (struct GNUNET_MessageHeader); | 197 | return sizeof (struct GNUNET_MessageHeader); |
198 | } | 198 | } |
diff --git a/src/core/test_core_api_peer1.conf b/src/core/test_core_api_peer1.conf index a4510d254..42533cebb 100644 --- a/src/core/test_core_api_peer1.conf +++ b/src/core/test_core_api_peer1.conf | |||
@@ -12,11 +12,11 @@ PLUGINS = tcp | |||
12 | #PREFIX = xterm -T transport1 -e | 12 | #PREFIX = xterm -T transport1 -e |
13 | #PREFIX = xterm -T transport1 -e gdb -x cmd --args | 13 | #PREFIX = xterm -T transport1 -e gdb -x cmd --args |
14 | #PREFIX = xterm -T transport1 -e valgrind --tool=memcheck | 14 | #PREFIX = xterm -T transport1 -e valgrind --tool=memcheck |
15 | #DEBUG = YES | 15 | DEBUG = YES |
16 | 16 | ||
17 | [arm] | 17 | [arm] |
18 | PORT = 12466 | 18 | PORT = 12466 |
19 | DEFAULTSERVICES = | 19 | DEFAULTSERVICES = resolver |
20 | #GLOBAL_PREFIX = xterm -e valgrind --tool=memcheck | 20 | #GLOBAL_PREFIX = xterm -e valgrind --tool=memcheck |
21 | 21 | ||
22 | [statistics] | 22 | [statistics] |
@@ -25,7 +25,7 @@ PORT = 12467 | |||
25 | 25 | ||
26 | [transport-tcp] | 26 | [transport-tcp] |
27 | PORT = 12468 | 27 | PORT = 12468 |
28 | #DEBUG = YES | 28 | DEBUG = YES |
29 | 29 | ||
30 | [peerinfo] | 30 | [peerinfo] |
31 | PORT = 12469 | 31 | PORT = 12469 |
@@ -39,7 +39,7 @@ PORT = 12470 | |||
39 | #OPTIONS = -l log-core-1 | 39 | #OPTIONS = -l log-core-1 |
40 | #PREFIX = xterm -T core1 -e gdb -x cmd --args | 40 | #PREFIX = xterm -T core1 -e gdb -x cmd --args |
41 | #PREFIX = xterm -T core1 -e | 41 | #PREFIX = xterm -T core1 -e |
42 | #DEBUG = YES | 42 | DEBUG = YES |
43 | 43 | ||
44 | [testing] | 44 | [testing] |
45 | WEAKRANDOM = YES | 45 | WEAKRANDOM = YES |
diff --git a/src/core/test_core_api_peer2.conf b/src/core/test_core_api_peer2.conf index a29090d78..2d27bf6c5 100644 --- a/src/core/test_core_api_peer2.conf +++ b/src/core/test_core_api_peer2.conf | |||
@@ -11,11 +11,11 @@ PORT = 22465 | |||
11 | PLUGINS = tcp | 11 | PLUGINS = tcp |
12 | #PREFIX = xterm -T transport2 -e | 12 | #PREFIX = xterm -T transport2 -e |
13 | #PREFIX = xterm -T transport2 -e valgrind --tool=memcheck | 13 | #PREFIX = xterm -T transport2 -e valgrind --tool=memcheck |
14 | #DEBUG = YES | 14 | DEBUG = YES |
15 | 15 | ||
16 | [arm] | 16 | [arm] |
17 | PORT = 22466 | 17 | PORT = 22466 |
18 | DEFAULTSERVICES = | 18 | DEFAULTSERVICES = resolver |
19 | #GLOBAL_PREFIX = xterm -e valgrind --tool=memcheck | 19 | #GLOBAL_PREFIX = xterm -e valgrind --tool=memcheck |
20 | 20 | ||
21 | [statistics] | 21 | [statistics] |
@@ -24,7 +24,7 @@ PORT = 22467 | |||
24 | 24 | ||
25 | [transport-tcp] | 25 | [transport-tcp] |
26 | PORT = 22468 | 26 | PORT = 22468 |
27 | #DEBUG = YES | 27 | DEBUG = YES |
28 | 28 | ||
29 | [peerinfo] | 29 | [peerinfo] |
30 | PORT = 22469 | 30 | PORT = 22469 |
@@ -36,7 +36,7 @@ PORT = 22469 | |||
36 | PORT = 22470 | 36 | PORT = 22470 |
37 | #PREFIX = xterm -T core2 -e | 37 | #PREFIX = xterm -T core2 -e |
38 | #PREFIX = xterm -T core2 -e valgrind --tool=memcheck | 38 | #PREFIX = xterm -T core2 -e valgrind --tool=memcheck |
39 | #DEBUG = YES | 39 | DEBUG = YES |
40 | 40 | ||
41 | [testing] | 41 | [testing] |
42 | WEAKRANDOM = YES | 42 | WEAKRANDOM = YES |