diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-11-04 21:01:22 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-11-04 21:01:22 +0000 |
commit | 0e4c7cdccfc4105f9c6e529cfa0e3722104b0ddf (patch) | |
tree | ac53b9088e75b7041e14e3455698a75da085b3d7 /src/integration-tests | |
parent | b6d09b511fbd61d3b36fde4c28624bed321bf4a1 (diff) | |
download | gnunet-0e4c7cdccfc4105f9c6e529cfa0e3722104b0ddf.tar.gz gnunet-0e4c7cdccfc4105f9c6e529cfa0e3722104b0ddf.zip |
-misc bugfixes, travel hacking
Diffstat (limited to 'src/integration-tests')
4 files changed, 6 insertions, 8 deletions
diff --git a/src/integration-tests/confs/c_no_nat_client.conf b/src/integration-tests/confs/c_no_nat_client.conf index 8d4c7e3e8..8e89f3f6e 100644 --- a/src/integration-tests/confs/c_no_nat_client.conf +++ b/src/integration-tests/confs/c_no_nat_client.conf | |||
@@ -140,7 +140,6 @@ ATS_MIN_INTERVAL = 15000 | |||
140 | ATS_EXEC_INTERVAL = 30000 | 140 | ATS_EXEC_INTERVAL = 30000 |
141 | 141 | ||
142 | [transport] | 142 | [transport] |
143 | #DEBUG = YES | ||
144 | #PREFIX = valgrind --alloc-fn=GNUNET_xmalloc_ --alloc-fn=GNUNET_xmalloc_unchecked_ --alloc-fn=GNUNET_xrealloc_ --alloc-fn=GNUNET_xgrow_ --massif-out-file=massif_client.out --tool=massif | 143 | #PREFIX = valgrind --alloc-fn=GNUNET_xmalloc_ --alloc-fn=GNUNET_xmalloc_unchecked_ --alloc-fn=GNUNET_xrealloc_ --alloc-fn=GNUNET_xgrow_ --massif-out-file=massif_client.out --tool=massif |
145 | AUTOSTART = YES | 144 | AUTOSTART = YES |
146 | PORT = 20029 | 145 | PORT = 20029 |
diff --git a/src/integration-tests/confs/c_no_nat_client_http.conf b/src/integration-tests/confs/c_no_nat_client_http.conf index 523a4fdcf..bbf6a64ec 100644 --- a/src/integration-tests/confs/c_no_nat_client_http.conf +++ b/src/integration-tests/confs/c_no_nat_client_http.conf | |||
@@ -141,7 +141,6 @@ ATS_EXEC_INTERVAL = 30000 | |||
141 | 141 | ||
142 | [transport] | 142 | [transport] |
143 | PREFIX = valgrind --leak-check=full | 143 | PREFIX = valgrind --leak-check=full |
144 | #DEBUG = YES | ||
145 | AUTOSTART = YES | 144 | AUTOSTART = YES |
146 | PORT = 20029 | 145 | PORT = 20029 |
147 | HOSTNAME = localhost | 146 | HOSTNAME = localhost |
diff --git a/src/integration-tests/confs/c_no_nat_client_unix.conf b/src/integration-tests/confs/c_no_nat_client_unix.conf index 62d679fd2..25373c927 100644 --- a/src/integration-tests/confs/c_no_nat_client_unix.conf +++ b/src/integration-tests/confs/c_no_nat_client_unix.conf | |||
@@ -141,7 +141,6 @@ ATS_EXEC_INTERVAL = 30000 | |||
141 | 141 | ||
142 | [transport] | 142 | [transport] |
143 | PREFIX = valgrind --leak-check=full | 143 | PREFIX = valgrind --leak-check=full |
144 | #DEBUG = YES | ||
145 | AUTOSTART = YES | 144 | AUTOSTART = YES |
146 | PORT = 20029 | 145 | PORT = 20029 |
147 | HOSTNAME = localhost | 146 | HOSTNAME = localhost |
diff --git a/src/integration-tests/connection_watchdog.c b/src/integration-tests/connection_watchdog.c index 17aab2159..0998a367e 100644 --- a/src/integration-tests/connection_watchdog.c +++ b/src/integration-tests/connection_watchdog.c | |||
@@ -1097,11 +1097,12 @@ main (int argc, char *const *argv) | |||
1097 | 1097 | ||
1098 | if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) | 1098 | if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) |
1099 | return 2; | 1099 | return 2; |
1100 | 1100 | ret = (GNUNET_OK == | |
1101 | return (GNUNET_OK == | 1101 | GNUNET_PROGRAM_run (argc, argv, "cn", |
1102 | GNUNET_PROGRAM_run (argc, argv, "cn", | 1102 | gettext_noop ("help text"), options, &run, |
1103 | gettext_noop ("help text"), options, &run, | 1103 | NULL)) ? ret : 1; |
1104 | NULL)) ? ret : 1; | 1104 | GNUNET_free ((void*) argv); |
1105 | return ret; | ||
1105 | } | 1106 | } |
1106 | 1107 | ||
1107 | /* end of connection_watchdog.c */ | 1108 | /* end of connection_watchdog.c */ |