diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-10-29 21:19:49 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-10-29 21:19:49 +0000 |
commit | 001b65cee47588c6c0bfa4ee1c6e4670f146ad23 (patch) | |
tree | c18c9babe40df8d2e29e291f6efd68c9e48f48b2 /src/transport/test_transport_api_limited_sockets.c | |
parent | 86208370814ef36db81f54164206a5b94f6ae272 (diff) |
-clean up test
Diffstat (limited to 'src/transport/test_transport_api_limited_sockets.c')
-rw-r--r-- | src/transport/test_transport_api_limited_sockets.c | 57 |
1 files changed, 21 insertions, 36 deletions
diff --git a/src/transport/test_transport_api_limited_sockets.c b/src/transport/test_transport_api_limited_sockets.c index e3c294a1c..69a510005 100644 --- a/src/transport/test_transport_api_limited_sockets.c +++ b/src/transport/test_transport_api_limited_sockets.c @@ -44,6 +44,9 @@ #define MAX_FILES 50 + +#if HAVE_SETRLIMIT + static char *test_source; static char *test_plugin; @@ -271,9 +274,6 @@ check () static char *const argv[] = { "test-transport-api", "-c", "test_transport_api_data.conf", -#if VERBOSE - "-L", "DEBUG", -#endif NULL }; static struct GNUNET_GETOPT_CommandLineOption options[] = { @@ -292,39 +292,24 @@ check () return ok; } + int main (int argc, char *argv[]) { + struct rlimit r_file_old; + struct rlimit r_file_new; + int res; int ret = 0; test_plugin = NULL; - GNUNET_TRANSPORT_TESTING_get_test_source_name (__FILE__, &test_source); GNUNET_TRANSPORT_TESTING_get_test_plugin_name (argv[0], test_source, &test_plugin); GNUNET_TRANSPORT_TESTING_get_test_name (argv[0], &test_name); - GNUNET_log_setup (test_name, -#if VERBOSE - "DEBUG", -#else "WARNING", -#endif NULL); -#if !HAVE_SETRLIMIT - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Cannot run test on this system\n"); - - GNUNET_free (test_source); - GNUNET_free (test_plugin); - GNUNET_free (test_name); - - return 0; -#else - struct rlimit r_file_old; - struct rlimit r_file_new; - int res; - res = getrlimit (RLIMIT_NOFILE, &r_file_old); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Maximum number of open files was: %u/%u\n", r_file_old.rlim_cur, @@ -347,27 +332,27 @@ main (int argc, char *argv[]) GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p1, 1); GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p2, 2); ret = check (); -#endif - GNUNET_free (cfg_file_p1); GNUNET_free (cfg_file_p2); - GNUNET_free (test_source); GNUNET_free (test_plugin); GNUNET_free (test_name); - -#if HAVE_SETRLIMIT - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Restoring previous value maximum number of open files\n"); - res = setrlimit (RLIMIT_NOFILE, &r_file_old); - if (res != 0) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Restoring limit failed!\n"); - return 0; - } -#endif return ret; } +#else +/* cannot setrlimit */ + + +int +main (int argc, char *argv[]) +{ + fprintf (stderr, "Cannot run test on this system\n"); + return 0; +} + +#endif + /* end of test_transport_api_limited_sockets.c */ + |