diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2011-04-21 08:50:04 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2011-04-21 08:50:04 +0000 |
commit | ff958297afb8c02bf2c8d28a277e22bf9617b964 (patch) | |
tree | 8dd30edafc6ba7953dafeda159291615130c0bd3 /src/transport | |
parent | 66f223d3faa3b2cbea3a5884599d533f33bb5abf (diff) | |
download | gnunet-ff958297afb8c02bf2c8d28a277e22bf9617b964.tar.gz gnunet-ff958297afb8c02bf2c8d28a277e22bf9617b964.zip |
Diffstat (limited to 'src/transport')
-rw-r--r-- | src/transport/test_transport_ats.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/transport/test_transport_ats.c b/src/transport/test_transport_ats.c index 6ce828f58..6ab4fcc51 100644 --- a/src/transport/test_transport_ats.c +++ b/src/transport/test_transport_ats.c | |||
@@ -569,7 +569,7 @@ daemon_start_cb (void *cls, | |||
569 | const struct GNUNET_CONFIGURATION_Handle *cfg, | 569 | const struct GNUNET_CONFIGURATION_Handle *cfg, |
570 | struct GNUNET_TESTING_Daemon *d, const char *emsg) | 570 | struct GNUNET_TESTING_Daemon *d, const char *emsg) |
571 | { | 571 | { |
572 | if (id == NULL) | 572 | if (id#if HAVE_LIBGLPK == NULL) |
573 | { | 573 | { |
574 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 574 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
575 | "Start callback called with error (too long starting peers), aborting test!\n"); | 575 | "Start callback called with error (too long starting peers), aborting test!\n"); |
@@ -668,11 +668,6 @@ check () | |||
668 | int | 668 | int |
669 | main (int argc, char *argv[]) | 669 | main (int argc, char *argv[]) |
670 | { | 670 | { |
671 | #if !HAVE_LIBGLPK | ||
672 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "GLPK not installed, exiting testcase\n"); | ||
673 | return 0; | ||
674 | #endif | ||
675 | |||
676 | int ret; | 671 | int ret; |
677 | 672 | ||
678 | GNUNET_log_setup ("test-transport-ats", | 673 | GNUNET_log_setup ("test-transport-ats", |
@@ -682,6 +677,12 @@ main (int argc, char *argv[]) | |||
682 | "INFO", | 677 | "INFO", |
683 | #endif | 678 | #endif |
684 | NULL); | 679 | NULL); |
680 | |||
681 | #if !HAVE_LIBGLPK | ||
682 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "GLPK not installed, exiting testcase\n"); | ||
683 | return 0; | ||
684 | #endif | ||
685 | |||
685 | GNUNET_DISK_directory_remove ("/tmp/test-gnunet-testing"); | 686 | GNUNET_DISK_directory_remove ("/tmp/test-gnunet-testing"); |
686 | 687 | ||
687 | machine_parsable = GNUNET_NO; | 688 | machine_parsable = GNUNET_NO; |