diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2011-03-22 18:36:57 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2011-03-22 18:36:57 +0000 |
commit | d74a1b1b52178c35f0f804c34bc63fe2c0203c1a (patch) | |
tree | 8bc74579832dba84590e504c03324b57c7f85500 /src/transport/test_transport_ats.c | |
parent | 2ee43bfc55897916316dbe52e8d294dc48f775e2 (diff) | |
download | gnunet-d74a1b1b52178c35f0f804c34bc63fe2c0203c1a.tar.gz gnunet-d74a1b1b52178c35f0f804c34bc63fe2c0203c1a.zip |
ats
and changed configure script...does not work correctly...but at least detects when glpk is NOT installed
Diffstat (limited to 'src/transport/test_transport_ats.c')
-rw-r--r-- | src/transport/test_transport_ats.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/transport/test_transport_ats.c b/src/transport/test_transport_ats.c index 2d3321a9e..0f80807f6 100644 --- a/src/transport/test_transport_ats.c +++ b/src/transport/test_transport_ats.c | |||
@@ -45,7 +45,7 @@ | |||
45 | /** | 45 | /** |
46 | * How long until we give up on transmitting the message? | 46 | * How long until we give up on transmitting the message? |
47 | */ | 47 | */ |
48 | #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 90) | 48 | #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5) |
49 | 49 | ||
50 | /** | 50 | /** |
51 | * How long until we give up on transmitting the message? | 51 | * How long until we give up on transmitting the message? |
@@ -138,7 +138,7 @@ end_badly () | |||
138 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from transports!\n"); | 138 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from transports!\n"); |
139 | GNUNET_break (0); | 139 | GNUNET_break (0); |
140 | GNUNET_TRANSPORT_disconnect (p1.th); | 140 | GNUNET_TRANSPORT_disconnect (p1.th); |
141 | GNUNET_TRANSPORT_disconnect (p2.th); | 141 | //GNUNET_TRANSPORT_disconnect (p2.th); |
142 | ok = 1; | 142 | ok = 1; |
143 | } | 143 | } |
144 | 144 | ||
@@ -367,11 +367,11 @@ run (void *cls, | |||
367 | &end_badly, NULL); | 367 | &end_badly, NULL); |
368 | 368 | ||
369 | setup_peer (&p1, "test_transport_ats_peer1.conf"); | 369 | setup_peer (&p1, "test_transport_ats_peer1.conf"); |
370 | setup_peer (&p2, "test_transport_ats_peer2.conf"); | 370 | //setup_peer (&p2, "test_transport_ats_peer2.conf"); |
371 | 371 | ||
372 | GNUNET_assert(p1.th != NULL); | 372 | GNUNET_assert(p1.th != NULL); |
373 | GNUNET_assert(p2.th != NULL); | 373 | //GNUNET_assert(p2.th != NULL); |
374 | 374 | return; | |
375 | GNUNET_TRANSPORT_get_hello (p1.th, &exchange_hello, &p1); | 375 | GNUNET_TRANSPORT_get_hello (p1.th, &exchange_hello, &p1); |
376 | } | 376 | } |
377 | 377 | ||
@@ -398,7 +398,7 @@ check () | |||
398 | argv, "test-transport-api", "nohelp", | 398 | argv, "test-transport-api", "nohelp", |
399 | options, &run, &ok); | 399 | options, &run, &ok); |
400 | stop_arm (&p1); | 400 | stop_arm (&p1); |
401 | stop_arm (&p2); | 401 | // stop_arm (&p2); |
402 | 402 | ||
403 | if (is_https) | 403 | if (is_https) |
404 | { | 404 | { |