[GNUnet-SVN] r16175 - in gnunet: contrib src/testing

[gnunet]

Author: grothoff
Date: 2011-07-25 16:11:35 +0200 (Mon, 25 Jul 2011)
New Revision: 16175

Modified:
   gnunet/contrib/defaults.conf
   gnunet/src/testing/testing_group.c
Log:
allow user to configure no deletion with testing

Modified: gnunet/contrib/defaults.conf
===================================================================
--- gnunet/contrib/defaults.conf        2011-07-25 14:02:25 UTC (rev 16174)
+++ gnunet/contrib/defaults.conf        2011-07-25 14:11:35 UTC (rev 16175)
@@ -18,6 +18,9 @@
 # How many connections can happen simultaneously?
 MAX_OUTSTANDING_CONNECTIONS = 50
 
+# Should we clean up the files on peer group shutdown?
+DELETE_FILES = YES
+
 [client]
 HOME = $SERVICEHOME
 

Modified: gnunet/src/testing/testing_group.c
===================================================================
--- gnunet/src/testing/testing_group.c  2011-07-25 14:02:25 UTC (rev 16174)
+++ gnunet/src/testing/testing_group.c  2011-07-25 14:11:35 UTC (rev 16175)
@@ -234,6 +234,11 @@
    * Closure for cb
    */
   void *cb_cls;
+
+  /**
+   * Should we delete all of the files from the peers?
+   */
+  int delete_files;
 };
 
 /**
@@ -6711,7 +6716,7 @@
       GNUNET_TESTING_daemon_stop (peer_shutdown_ctx->daemon,
                                   shutdown_ctx->timeout,
                                   &internal_shutdown_callback, 
peer_shutdown_ctx,
-                                  GNUNET_YES, GNUNET_NO);
+                                  shutdown_ctx->delete_files, GNUNET_NO);
     }
   else
     GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_MILLISECONDS,
@@ -6745,6 +6750,9 @@
   GNUNET_assert (pg->total > 0);
 
   shutdown_ctx = GNUNET_malloc (sizeof (struct ShutdownContext));
+  shutdown_ctx->delete_files = GNUNET_CONFIGURATION_get_value_yesno (pg->cfg,
+                                                                    "TESTING",
+                                                                    
"DELETE_FILES");
   shutdown_ctx->cb = cb;
   shutdown_ctx->cb_cls = cb_cls;
   shutdown_ctx->total_peers = pg->total;