gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r22160 - in gnunet/src: datastore fs lockmanager nse stream


From: gnunet
Subject: [GNUnet-SVN] r22160 - in gnunet/src: datastore fs lockmanager nse stream vpn
Date: Wed, 20 Jun 2012 17:14:44 +0200

Author: harsha
Date: 2012-06-20 17:14:44 +0200 (Wed, 20 Jun 2012)
New Revision: 22160

Modified:
   gnunet/src/datastore/perf_datastore_api.c
   gnunet/src/datastore/test_datastore_api.c
   gnunet/src/datastore/test_datastore_api_management.c
   gnunet/src/fs/test_fs_download.c
   gnunet/src/fs/test_fs_download_indexed.c
   gnunet/src/fs/test_fs_download_persistence.c
   gnunet/src/fs/test_fs_list_indexed.c
   gnunet/src/fs/test_fs_namespace.c
   gnunet/src/fs/test_fs_namespace_list_updateable.c
   gnunet/src/fs/test_fs_publish.c
   gnunet/src/fs/test_fs_publish_persistence.c
   gnunet/src/fs/test_fs_search.c
   gnunet/src/fs/test_fs_search_persistence.c
   gnunet/src/fs/test_fs_search_probes.c
   gnunet/src/fs/test_fs_start_stop.c
   gnunet/src/fs/test_fs_unindex.c
   gnunet/src/fs/test_fs_unindex_persistence.c
   gnunet/src/lockmanager/test_lockmanager_api.c
   gnunet/src/nse/test_nse_api.c
   gnunet/src/stream/test_stream_big.c
   gnunet/src/vpn/test_gnunet_vpn.c
Log:
-fixes for api change in testing library

Modified: gnunet/src/datastore/perf_datastore_api.c
===================================================================
--- gnunet/src/datastore/perf_datastore_api.c   2012-06-20 14:43:29 UTC (rev 
22159)
+++ gnunet/src/datastore/perf_datastore_api.c   2012-06-20 15:14:44 UTC (rev 
22160)
@@ -295,7 +295,8 @@
 
 static void
 run (void *cls, 
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
+     const struct GNUNET_CONFIGURATION_Handle *cfg,
+     struct GNUNET_TESTING_Peer *peer)
 {
   struct CpsRunContext *crc;
   static struct GNUNET_HashCode zkey;

Modified: gnunet/src/datastore/test_datastore_api.c
===================================================================
--- gnunet/src/datastore/test_datastore_api.c   2012-06-20 14:43:29 UTC (rev 
22159)
+++ gnunet/src/datastore/test_datastore_api.c   2012-06-20 15:14:44 UTC (rev 
22160)
@@ -464,7 +464,8 @@
 
 static void
 run (void *cls, 
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
+     const struct GNUNET_CONFIGURATION_Handle *cfg,
+     struct GNUNET_TESTING_Peer *peer)
 {
   struct CpsRunContext *crc;
   static struct GNUNET_HashCode zkey;

Modified: gnunet/src/datastore/test_datastore_api_management.c
===================================================================
--- gnunet/src/datastore/test_datastore_api_management.c        2012-06-20 
14:43:29 UTC (rev 22159)
+++ gnunet/src/datastore/test_datastore_api_management.c        2012-06-20 
15:14:44 UTC (rev 22160)
@@ -259,7 +259,8 @@
 
 static void
 run (void *cls, 
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
+     const struct GNUNET_CONFIGURATION_Handle *cfg,
+     struct GNUNET_TESTING_Peer *peer)
 {
   struct CpsRunContext *crc;
   static struct GNUNET_HashCode zkey;

Modified: gnunet/src/fs/test_fs_download.c
===================================================================
--- gnunet/src/fs/test_fs_download.c    2012-06-20 14:43:29 UTC (rev 22159)
+++ gnunet/src/fs/test_fs_download.c    2012-06-20 15:14:44 UTC (rev 22160)
@@ -232,7 +232,8 @@
 
 static void
 run (void *cls,
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
+     const struct GNUNET_CONFIGURATION_Handle *cfg,
+     struct GNUNET_TESTING_Peer *peer)
 {
   const char *keywords[] = {
     "down_foo",

Modified: gnunet/src/fs/test_fs_download_indexed.c
===================================================================
--- gnunet/src/fs/test_fs_download_indexed.c    2012-06-20 14:43:29 UTC (rev 
22159)
+++ gnunet/src/fs/test_fs_download_indexed.c    2012-06-20 15:14:44 UTC (rev 
22160)
@@ -232,7 +232,8 @@
 
 static void
 run (void *cls,
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
+     const struct GNUNET_CONFIGURATION_Handle *cfg,
+     struct GNUNET_TESTING_Peer *peer)
 {
   const char *keywords[] = {
     "down_foo",

Modified: gnunet/src/fs/test_fs_download_persistence.c
===================================================================
--- gnunet/src/fs/test_fs_download_persistence.c        2012-06-20 14:43:29 UTC 
(rev 22159)
+++ gnunet/src/fs/test_fs_download_persistence.c        2012-06-20 15:14:44 UTC 
(rev 22160)
@@ -277,7 +277,8 @@
 
 static void
 run (void *cls, 
-     const struct GNUNET_CONFIGURATION_Handle *c)
+     const struct GNUNET_CONFIGURATION_Handle *c,
+     struct GNUNET_TESTING_Peer *peer)
 {
   const char *keywords[] = {
     "down_foo",

Modified: gnunet/src/fs/test_fs_list_indexed.c
===================================================================
--- gnunet/src/fs/test_fs_list_indexed.c        2012-06-20 14:43:29 UTC (rev 
22159)
+++ gnunet/src/fs/test_fs_list_indexed.c        2012-06-20 15:14:44 UTC (rev 
22160)
@@ -170,7 +170,8 @@
 
 static void
 run (void *cls,
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
+     const struct GNUNET_CONFIGURATION_Handle *cfg,
+     struct GNUNET_TESTING_Peer *peer)
 {
   const char *keywords[] = {
     "down_foo",

Modified: gnunet/src/fs/test_fs_namespace.c
===================================================================
--- gnunet/src/fs/test_fs_namespace.c   2012-06-20 14:43:29 UTC (rev 22159)
+++ gnunet/src/fs/test_fs_namespace.c   2012-06-20 15:14:44 UTC (rev 22160)
@@ -318,7 +318,8 @@
 
 static void
 run (void *cls, 
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
+     const struct GNUNET_CONFIGURATION_Handle *cfg,
+     struct GNUNET_TESTING_Peer *peer)
 {
   fs = GNUNET_FS_start (cfg, "test-fs-namespace", &progress_cb, NULL,
                         GNUNET_FS_FLAGS_NONE, GNUNET_FS_OPTIONS_END);

Modified: gnunet/src/fs/test_fs_namespace_list_updateable.c
===================================================================
--- gnunet/src/fs/test_fs_namespace_list_updateable.c   2012-06-20 14:43:29 UTC 
(rev 22159)
+++ gnunet/src/fs/test_fs_namespace_list_updateable.c   2012-06-20 15:14:44 UTC 
(rev 22160)
@@ -151,7 +151,8 @@
 
 static void
 run (void *cls, 
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
+     const struct GNUNET_CONFIGURATION_Handle *cfg,
+     struct GNUNET_TESTING_Peer *peer)
 {
   fs = GNUNET_FS_start (cfg, "test-fs-namespace", &progress_cb, NULL,
                         GNUNET_FS_FLAGS_NONE, GNUNET_FS_OPTIONS_END);

Modified: gnunet/src/fs/test_fs_publish.c
===================================================================
--- gnunet/src/fs/test_fs_publish.c     2012-06-20 14:43:29 UTC (rev 22159)
+++ gnunet/src/fs/test_fs_publish.c     2012-06-20 15:14:44 UTC (rev 22160)
@@ -154,7 +154,8 @@
 
 static void
 run (void *cls, 
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
+     const struct GNUNET_CONFIGURATION_Handle *cfg,
+     struct GNUNET_TESTING_Peer *peer)
 {
   const char *keywords[] = {
     "down_foo",

Modified: gnunet/src/fs/test_fs_publish_persistence.c
===================================================================
--- gnunet/src/fs/test_fs_publish_persistence.c 2012-06-20 14:43:29 UTC (rev 
22159)
+++ gnunet/src/fs/test_fs_publish_persistence.c 2012-06-20 15:14:44 UTC (rev 
22160)
@@ -219,7 +219,8 @@
 
 static void
 run (void *cls, 
-     const struct GNUNET_CONFIGURATION_Handle *c)
+     const struct GNUNET_CONFIGURATION_Handle *c,
+     struct GNUNET_TESTING_Peer *peer)
 {
   const char *keywords[] = {
     "down_foo",

Modified: gnunet/src/fs/test_fs_search.c
===================================================================
--- gnunet/src/fs/test_fs_search.c      2012-06-20 14:43:29 UTC (rev 22159)
+++ gnunet/src/fs/test_fs_search.c      2012-06-20 15:14:44 UTC (rev 22160)
@@ -153,7 +153,8 @@
 
 static void
 run (void *cls,
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
+     const struct GNUNET_CONFIGURATION_Handle *cfg,
+     struct GNUNET_TESTING_Peer *peer)
 {
   const char *keywords[] = {
     "down_foo",

Modified: gnunet/src/fs/test_fs_search_persistence.c
===================================================================
--- gnunet/src/fs/test_fs_search_persistence.c  2012-06-20 14:43:29 UTC (rev 
22159)
+++ gnunet/src/fs/test_fs_search_persistence.c  2012-06-20 15:14:44 UTC (rev 
22160)
@@ -214,7 +214,8 @@
 
 static void
 run (void *cls,
-     const struct GNUNET_CONFIGURATION_Handle *c)
+     const struct GNUNET_CONFIGURATION_Handle *c,
+     struct GNUNET_TESTING_Peer *peer)
 {
   const char *keywords[] = {
     "down_foo",

Modified: gnunet/src/fs/test_fs_search_probes.c
===================================================================
--- gnunet/src/fs/test_fs_search_probes.c       2012-06-20 14:43:29 UTC (rev 
22159)
+++ gnunet/src/fs/test_fs_search_probes.c       2012-06-20 15:14:44 UTC (rev 
22160)
@@ -156,7 +156,8 @@
 
 static void
 run (void *cls,
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
+     const struct GNUNET_CONFIGURATION_Handle *cfg,
+     struct GNUNET_TESTING_Peer *peer)
 {
   const char *keywords[] = {
     "down_foo",

Modified: gnunet/src/fs/test_fs_start_stop.c
===================================================================
--- gnunet/src/fs/test_fs_start_stop.c  2012-06-20 14:43:29 UTC (rev 22159)
+++ gnunet/src/fs/test_fs_start_stop.c  2012-06-20 15:14:44 UTC (rev 22160)
@@ -38,7 +38,8 @@
 
 static void
 run (void *cls, 
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
+     const struct GNUNET_CONFIGURATION_Handle *cfg,
+     struct GNUNET_TESTING_Peer *peer)
 {
   struct GNUNET_FS_Handle *fs;
 

Modified: gnunet/src/fs/test_fs_unindex.c
===================================================================
--- gnunet/src/fs/test_fs_unindex.c     2012-06-20 14:43:29 UTC (rev 22159)
+++ gnunet/src/fs/test_fs_unindex.c     2012-06-20 15:14:44 UTC (rev 22160)
@@ -168,7 +168,8 @@
 
 static void
 run (void *cls,
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
+     const struct GNUNET_CONFIGURATION_Handle *cfg,
+     struct GNUNET_TESTING_Peer *peer)
 {
   const char *keywords[] = {
     "down_foo",

Modified: gnunet/src/fs/test_fs_unindex_persistence.c
===================================================================
--- gnunet/src/fs/test_fs_unindex_persistence.c 2012-06-20 14:43:29 UTC (rev 
22159)
+++ gnunet/src/fs/test_fs_unindex_persistence.c 2012-06-20 15:14:44 UTC (rev 
22160)
@@ -231,7 +231,8 @@
 
 static void
 run (void *cls, 
-     const struct GNUNET_CONFIGURATION_Handle *c)
+     const struct GNUNET_CONFIGURATION_Handle *c,
+     struct GNUNET_TESTING_Peer *peer)
 {
   const char *keywords[] = {
     "down_foo",

Modified: gnunet/src/lockmanager/test_lockmanager_api.c
===================================================================
--- gnunet/src/lockmanager/test_lockmanager_api.c       2012-06-20 14:43:29 UTC 
(rev 22159)
+++ gnunet/src/lockmanager/test_lockmanager_api.c       2012-06-20 15:14:44 UTC 
(rev 22160)
@@ -177,7 +177,7 @@
 static void
 run (void *cls,
      const struct GNUNET_CONFIGURATION_Handle *cfg,
-     const struct GNUNET_TESTING_Peer *peer)
+     struct GNUNET_TESTING_Peer *peer)
 {
   LOG (GNUNET_ERROR_TYPE_DEBUG, "Starting test...\n");
   config = cfg;
@@ -201,10 +201,9 @@
 int main (int argc, char **argv)
 {
 
-  if (0 != GNUNET_TESTING_service_run_restartable ("test_lockmanager_api",
-                                                  "arm",
-                                                  "test_lockmanager_api.conf", 
                                           
-                                                  &run, NULL))
+  if (0 != GNUNET_TESTING_peer_run ("test_lockmanager_api",
+                                   "test_lockmanager_api.conf",                
                                   
+                                   &run, NULL))
     return 1;
   return (TEST_FAIL == result) ? 1 : 0;
 }

Modified: gnunet/src/nse/test_nse_api.c
===================================================================
--- gnunet/src/nse/test_nse_api.c       2012-06-20 14:43:29 UTC (rev 22159)
+++ gnunet/src/nse/test_nse_api.c       2012-06-20 15:14:44 UTC (rev 22160)
@@ -77,7 +77,8 @@
 
 static void
 run (void *cls, 
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
+     const struct GNUNET_CONFIGURATION_Handle *cfg,
+     struct GNUNET_TESTING_Peer *peer)
 {
   die_task =
       GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply

Modified: gnunet/src/stream/test_stream_big.c
===================================================================
--- gnunet/src/stream/test_stream_big.c 2012-06-20 14:43:29 UTC (rev 22159)
+++ gnunet/src/stream/test_stream_big.c 2012-06-20 15:14:44 UTC (rev 22160)
@@ -102,6 +102,7 @@
     GNUNET_SCHEDULER_cancel (abort_task);
   }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Wait\n");
+  GNUNET_SCHEDULER_shutdown ();
 }
 
 
@@ -306,8 +307,8 @@
  */
 static int
 stream_listen_cb (void *cls,
-           struct GNUNET_STREAM_Socket *socket,
-           const struct GNUNET_PeerIdentity *initiator)
+                 struct GNUNET_STREAM_Socket *socket,
+                 const struct GNUNET_PeerIdentity *initiator)
 {
   GNUNET_assert (NULL != socket);
   GNUNET_assert (socket != peer1.socket);
@@ -354,7 +355,7 @@
 static void
 run (void *cls, 
      const struct GNUNET_CONFIGURATION_Handle *cfg,
-     const struct GNUNET_TESTING_Peer *peer)
+     struct GNUNET_TESTING_Peer *peer)
 {
   struct GNUNET_PeerIdentity self;
   
@@ -380,10 +381,9 @@
  */
 int main (int argc, char **argv)
 {
-  if (0 != GNUNET_TESTING_service_run_restartable ("test-stream-big",
-                                                  "arm",
-                                                  "test_stream_local.conf",    
                                           
-                                                  &run, NULL))
+  if (0 != GNUNET_TESTING_peer_run ("test-stream-big",
+                                   "test_stream_local.conf",                   
                           
+                                   &run, NULL))
     return 1;
   return (GNUNET_SYSERR == result) ? 1 : 0;
 }

Modified: gnunet/src/vpn/test_gnunet_vpn.c
===================================================================
--- gnunet/src/vpn/test_gnunet_vpn.c    2012-06-20 14:43:29 UTC (rev 22159)
+++ gnunet/src/vpn/test_gnunet_vpn.c    2012-06-20 15:14:44 UTC (rev 22160)
@@ -374,7 +374,8 @@
 
 static void
 run (void *cls,
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
+     const struct GNUNET_CONFIGURATION_Handle *cfg,
+     struct GNUNET_TESTING_Peer *peer)
 {
   struct in_addr v4;
   struct in6_addr v6;




reply via email to

[Prev in Thread] Current Thread [Next in Thread]