aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2011-07-18 09:18:33 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2011-07-18 09:18:33 +0000
commitabbcaa1646f2bdba33cb88febc875e2332624458 (patch)
tree5a30dd69d6feebd7b532a3b47f37c5a06faa9aeb /src
parent06192010f75ca54c8542b9d88b1306affb2deffe (diff)
downloadgnunet-abbcaa1646f2bdba33cb88febc875e2332624458.tar.gz
gnunet-abbcaa1646f2bdba33cb88febc875e2332624458.zip
Diffstat (limited to 'src')
-rw-r--r--src/transport/test_transport_ats_multiple_peers.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/transport/test_transport_ats_multiple_peers.c b/src/transport/test_transport_ats_multiple_peers.c
index 408bc407c..6e8752a0b 100644
--- a/src/transport/test_transport_ats_multiple_peers.c
+++ b/src/transport/test_transport_ats_multiple_peers.c
@@ -25,12 +25,12 @@
25#include "platform.h" 25#include "platform.h"
26#include "gnunet_util_lib.h" 26#include "gnunet_util_lib.h"
27 27
28#if HAVE_LIBGLPK && HAVE_GLPK 28#if HAVE_LIBGLPK
29 29
30#include "gnunet_testing_lib.h" 30#include "gnunet_testing_lib.h"
31#include "gnunet_transport_service.h" 31#include "gnunet_transport_service.h"
32#include "gauger.h" 32#include "gauger.h"
33#include "transport_ats.h" 33#include "gnunet_transport_ats.h"
34 34
35#define VERBOSE GNUNET_NO 35#define VERBOSE GNUNET_NO
36 36
@@ -784,7 +784,7 @@ check ()
784 GNUNET_GETOPT_OPTION_END 784 GNUNET_GETOPT_OPTION_END
785 }; 785 };
786 GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, 786 GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
787 argv, "test-transport-ats", "nohelp", 787 argv, "test_transport_ats_multiple_peers", "nohelp",
788 options, &run, &ok); 788 options, &run, &ok);
789 return ok; 789 return ok;
790} 790}
@@ -794,7 +794,7 @@ check ()
794int 794int
795main (int argc, char *argv[]) 795main (int argc, char *argv[])
796{ 796{
797 int ret; 797 int ret = 0;
798 798
799 GNUNET_log_setup ("test-transport-ats-multiple-peers", 799 GNUNET_log_setup ("test-transport-ats-multiple-peers",
800#if VERBOSE 800#if VERBOSE
@@ -804,12 +804,11 @@ main (int argc, char *argv[])
804#endif 804#endif
805 NULL); 805 NULL);
806 806
807#if !HAVE_LIBGLPK && !HAVE_GLPK 807#if !HAVE_LIBGLPK
808 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 808 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
809 "GLPK not installed, exiting testcase\n"); 809 "GLPK not installed, exiting testcase\n");
810 return 0; 810 return ret;
811#else 811#else
812
813 GNUNET_DISK_directory_remove ("/tmp/test-gnunet-testing"); 812 GNUNET_DISK_directory_remove ("/tmp/test-gnunet-testing");
814 machine_parsable = GNUNET_NO; 813 machine_parsable = GNUNET_NO;
815 peers = NUM_PEERS; 814 peers = NUM_PEERS;
@@ -839,8 +838,6 @@ main (int argc, char *argv[])
839 } 838 }
840 } 839 }
841 840
842
843
844 ret = check (); 841 ret = check ();
845 /** 842 /**
846 * Still need to remove the base testing directory here, 843 * Still need to remove the base testing directory here,