[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r17403 - gnunet/src/testing
From: |
gnunet |
Subject: |
[GNUnet-SVN] r17403 - gnunet/src/testing |
Date: |
Wed, 12 Oct 2011 13:55:38 +0200 |
Author: grothoff
Date: 2011-10-12 13:55:38 +0200 (Wed, 12 Oct 2011)
New Revision: 17403
Modified:
gnunet/src/testing/test_testing_reconnect.c
gnunet/src/testing/testing.c
Log:
better logging
Modified: gnunet/src/testing/test_testing_reconnect.c
===================================================================
--- gnunet/src/testing/test_testing_reconnect.c 2011-10-12 11:54:32 UTC (rev
17402)
+++ gnunet/src/testing/test_testing_reconnect.c 2011-10-12 11:55:38 UTC (rev
17403)
@@ -98,11 +98,13 @@
{
ok = 0;
}
-
- GNUNET_TESTING_daemon_stop (d2, TIMEOUT, &end2_cb, NULL,
- (phase == NUM_PHASES) ? GNUNET_YES : GNUNET_NO,
- GNUNET_NO);
- d2 = NULL;
+ if (d2 != NULL)
+ {
+ GNUNET_TESTING_daemon_stop (d2, TIMEOUT, &end2_cb, NULL,
+ (phase == NUM_PHASES) ? GNUNET_YES : GNUNET_NO,
+ GNUNET_NO);
+ d2 = NULL;
+ }
}
static void
@@ -141,6 +143,13 @@
const struct GNUNET_CONFIGURATION_Handle *cfg,
struct GNUNET_TESTING_Daemon *d, const char *emsg)
{
+ if (emsg != NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Starting daemon 2 gave: %s\n",
+ emsg);
+ GNUNET_assert (0);
+ return;
+ }
GNUNET_assert (id != NULL);
#if VERBOSE
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Daemon `%s' started.\n",
@@ -156,6 +165,13 @@
const struct GNUNET_CONFIGURATION_Handle *cfg,
struct GNUNET_TESTING_Daemon *d, const char *emsg)
{
+ if (emsg != NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Starting daemon 1 gave: %s\n",
+ emsg);
+ GNUNET_assert (0);
+ return;
+ }
GNUNET_assert (id != NULL);
#if VERBOSE
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Daemon `%s' started.\n",
Modified: gnunet/src/testing/testing.c
===================================================================
--- gnunet/src/testing/testing.c 2011-10-12 11:54:32 UTC (rev 17402)
+++ gnunet/src/testing/testing.c 2011-10-12 11:55:38 UTC (rev 17403)
@@ -384,7 +384,7 @@
GNUNET_OS_process_close (d->proc);
d->proc = NULL;
if (NULL != cb)
- cb (d->cb_cls, NULL, d->cfg, d, _("`Failed to get hostkey!\n"));
+ cb (d->cb_cls, NULL, d->cfg, d, _("Failed to get hostkey!\n"));
return;
}
d->shortname = GNUNET_strdup (GNUNET_i2s (&d->id));
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r17403 - gnunet/src/testing,
gnunet <=