[GNUnet-SVN] r21279 - in gnunet/src: testbed testing

[gnunet]

Author: grothoff
Date: 2012-05-05 17:52:36 +0200 (Sat, 05 May 2012)
New Revision: 21279

Modified:
   gnunet/src/testbed/testbed.h
   gnunet/src/testbed/testbed_api.c
   gnunet/src/testbed/testbed_api_hosts.c
   gnunet/src/testbed/testbed_api_hosts.h
   gnunet/src/testbed/testbed_api_operations.c
   gnunet/src/testbed/testbed_api_operations.h
   gnunet/src/testbed/testbed_api_peers.c
   gnunet/src/testbed/testbed_api_peers.h
   gnunet/src/testbed/testbed_api_services.c
   gnunet/src/testbed/testbed_api_test.c
   gnunet/src/testbed/testbed_api_testbed.c
   gnunet/src/testbed/testbed_api_topology.c
   gnunet/src/testing/Makefile.am
Log:
-build issues'


Modified: gnunet/src/testbed/testbed.h
===================================================================
--- gnunet/src/testbed/testbed.h        2012-05-05 15:51:11 UTC (rev 21278)
+++ gnunet/src/testbed/testbed.h        2012-05-05 15:52:36 UTC (rev 21279)
@@ -19,7 +19,7 @@
  */
 
 /**
- * @file testing/new_testing.h
+ * @file testing/testbed.h
  * @brief IPC messages between testing API and service ("controller")
  * @author Christian Grothoff
  */

Modified: gnunet/src/testbed/testbed_api.c
===================================================================
--- gnunet/src/testbed/testbed_api.c    2012-05-05 15:51:11 UTC (rev 21278)
+++ gnunet/src/testbed/testbed_api.c    2012-05-05 15:52:36 UTC (rev 21279)
@@ -19,14 +19,14 @@
  */
 
 /**
- * @file testing/new_testing_api.c
+ * @file testing/testbed_api.c
  * @brief API for accessing the GNUnet testing service.
  *        This library is supposed to make it easier to write
  *        testcases and script large-scale benchmarks.
  * @author Christian Grothoff
  */
 #include "platform.h"
-#include "gnunet_testing_service.h"
+#include "gnunet_testbed_service.h"
 #include "gnunet_core_service.h"
 #include "gnunet_constants.h"
 #include "gnunet_transport_service.h"
@@ -147,4 +147,4 @@
 
 
 
-/* end of new_testing_api.c */
+/* end of testbed_api.c */

Modified: gnunet/src/testbed/testbed_api_hosts.c
===================================================================
--- gnunet/src/testbed/testbed_api_hosts.c      2012-05-05 15:51:11 UTC (rev 
21278)
+++ gnunet/src/testbed/testbed_api_hosts.c      2012-05-05 15:52:36 UTC (rev 
21279)
@@ -19,14 +19,14 @@
  */
 
 /**
- * @file testing/new_testing_api_hosts.c
+ * @file testing/testbed_api_hosts.c
  * @brief API for manipulating 'hosts' controlled by the GNUnet testing 
service;
  *        allows parsing hosts files, starting, stopping and communicating (via
  *        SSH/stdin/stdout) with the remote (or local) processes
  * @author Christian Grothoff
  */
 #include "platform.h"
-#include "gnunet_testing_service.h"
+#include "gnunet_testbed_service.h"
 #include "gnunet_core_service.h"
 #include "gnunet_constants.h"
 #include "gnunet_transport_service.h"
@@ -197,4 +197,4 @@
 }
 
 
-/* end of new_testing_api_hosts.c */
+/* end of testbed_api_hosts.c */

Modified: gnunet/src/testbed/testbed_api_hosts.h
===================================================================
--- gnunet/src/testbed/testbed_api_hosts.h      2012-05-05 15:51:11 UTC (rev 
21278)
+++ gnunet/src/testbed/testbed_api_hosts.h      2012-05-05 15:52:36 UTC (rev 
21279)
@@ -19,14 +19,14 @@
  */
 
 /**
- * @file testing/new_testing_api_hosts.h
+ * @file testing/testbed_api_hosts.h
  * @brief internal API to access the 'hosts' subsystem
  * @author Christian Grothoff
  */
 #ifndef NEW_TESTING_API_HOSTS_H
 #define NEW_TESTING_API_HOSTS_H
 
-#include "gnunet_testing_service.h"
+#include "gnunet_testbed_service.h"
 #include "gnunet_helper_lib.h"
 
 
@@ -102,4 +102,4 @@
                          GNUNET_SERVER_MessageTokenizerCallback cb, void 
*cb_cls);
 
 #endif
-/* end of new_testing_api_hosts.h */
+/* end of testbed_api_hosts.h */

Modified: gnunet/src/testbed/testbed_api_operations.c
===================================================================
--- gnunet/src/testbed/testbed_api_operations.c 2012-05-05 15:51:11 UTC (rev 
21278)
+++ gnunet/src/testbed/testbed_api_operations.c 2012-05-05 15:52:36 UTC (rev 
21279)
@@ -19,12 +19,12 @@
  */
 
 /**
- * @file testing/new_testing_api_operations.c
+ * @file testing/testbed_api_operations.c
  * @brief functions to manage operation queues
  * @author Christian Grothoff
  */
 #include "platform.h"
-#include "new_testing_api_operations.h"
+#include "testbed_api_operations.h"
 
 
 /**
@@ -71,4 +71,4 @@
 
 
 
-/* end of new_testing_api_operations.c */
+/* end of testbed_api_operations.c */

Modified: gnunet/src/testbed/testbed_api_operations.h
===================================================================
--- gnunet/src/testbed/testbed_api_operations.h 2012-05-05 15:51:11 UTC (rev 
21278)
+++ gnunet/src/testbed/testbed_api_operations.h 2012-05-05 15:52:36 UTC (rev 
21279)
@@ -19,16 +19,16 @@
  */
 
 /**
- * @file testing/new_testing_api_operations.h
+ * @file testing/testbed_api_operations.h
  * @brief internal API to access the 'operations' subsystem
  * @author Christian Grothoff
  */
 #ifndef NEW_TESTING_API_OPERATIONS_H
 #define NEW_TESTING_API_OPERATIONS_H
 
-#include "gnunet_testing_service.h"
+#include "gnunet_testbed_service.h"
 #include "gnunet_helper_lib.h"
 
 
 #endif
-/* end of new_testing_api_operations.h */
+/* end of testbed_api_operations.h */

Modified: gnunet/src/testbed/testbed_api_peers.c
===================================================================
--- gnunet/src/testbed/testbed_api_peers.c      2012-05-05 15:51:11 UTC (rev 
21278)
+++ gnunet/src/testbed/testbed_api_peers.c      2012-05-05 15:52:36 UTC (rev 
21279)
@@ -19,13 +19,13 @@
  */
 
 /**
- * @file testing/new_testing_api_peers.c
+ * @file testing/testbed_api_peers.c
  * @brief management of the knowledge about peers in this library
  *        (we know the peer ID, its host, pending operations, etc.)
  * @author Christian Grothoff
  */
 #include "platform.h"
-#include "new_testing_api_peers.h"
+#include "testbed_api_peers.h"
 
 
 /**
@@ -294,4 +294,4 @@
 
 
 
-/* end of new_testing_api_peers.c */
+/* end of testbed_api_peers.c */

Modified: gnunet/src/testbed/testbed_api_peers.h
===================================================================
--- gnunet/src/testbed/testbed_api_peers.h      2012-05-05 15:51:11 UTC (rev 
21278)
+++ gnunet/src/testbed/testbed_api_peers.h      2012-05-05 15:52:36 UTC (rev 
21279)
@@ -19,14 +19,14 @@
  */
 
 /**
- * @file testing/new_testing_api_peers.h
+ * @file testing/testbed_api_peers.h
  * @brief internal API to access the 'peers' subsystem
  * @author Christian Grothoff
  */
 #ifndef NEW_TESTING_API_PEERS_H
 #define NEW_TESTING_API_PEERS_H
 
-#include "gnunet_testing_service.h"
+#include "gnunet_testbed_service.h"
 #include "gnunet_helper_lib.h"
 
 
@@ -68,4 +68,4 @@
 
 
 #endif
-/* end of new_testing_api_peers.h */
+/* end of testbed_api_peers.h */

Modified: gnunet/src/testbed/testbed_api_services.c
===================================================================
--- gnunet/src/testbed/testbed_api_services.c   2012-05-05 15:51:11 UTC (rev 
21278)
+++ gnunet/src/testbed/testbed_api_services.c   2012-05-05 15:52:36 UTC (rev 
21279)
@@ -19,12 +19,12 @@
  */
 
 /**
- * @file testing/new_testing_api_services.c
+ * @file testing/testbed_api_services.c
  * @brief convenience functions for accessing services
  * @author Christian Grothoff
  */
 #include "platform.h"
-#include "new_testing_api_peers.h"
+#include "testbed_api_peers.h"
 
 
 /**
@@ -58,4 +58,4 @@
   return NULL;
 }
 
-/* end of new_testing_api_services.c */
+/* end of testbed_api_services.c */

Modified: gnunet/src/testbed/testbed_api_test.c
===================================================================
--- gnunet/src/testbed/testbed_api_test.c       2012-05-05 15:51:11 UTC (rev 
21278)
+++ gnunet/src/testbed/testbed_api_test.c       2012-05-05 15:52:36 UTC (rev 
21279)
@@ -19,12 +19,12 @@
  */
 
 /**
- * @file testing/new_testing_api_test.c
+ * @file testing/testbed_api_test.c
  * @brief high-level test function
  * @author Christian Grothoff
  */
 #include "platform.h"
-#include "gnunet_testing_service.h"
+#include "gnunet_testbed_service.h"
 
 
 
@@ -64,4 +64,4 @@
 
 
 
-/* end of new_testing_api_test.c */
+/* end of testbed_api_test.c */

Modified: gnunet/src/testbed/testbed_api_testbed.c
===================================================================
--- gnunet/src/testbed/testbed_api_testbed.c    2012-05-05 15:51:11 UTC (rev 
21278)
+++ gnunet/src/testbed/testbed_api_testbed.c    2012-05-05 15:52:36 UTC (rev 
21279)
@@ -19,12 +19,12 @@
  */
 
 /**
- * @file testing/new_testing_api_testbed.c
+ * @file testing/testbed_api_testbed.c
  * @brief high-level testbed management
  * @author Christian Grothoff
  */
 #include "platform.h"
-#include "gnunet_testing_service.h"
+#include "gnunet_testbed_service.h"
 
 
 /**
@@ -150,4 +150,4 @@
 
 
 
-/* end of new_testing_api_testbed.c */
+/* end of testbed_api_testbed.c */

Modified: gnunet/src/testbed/testbed_api_topology.c
===================================================================
--- gnunet/src/testbed/testbed_api_topology.c   2012-05-05 15:51:11 UTC (rev 
21278)
+++ gnunet/src/testbed/testbed_api_topology.c   2012-05-05 15:52:36 UTC (rev 
21279)
@@ -19,12 +19,12 @@
  */
 
 /**
- * @file testing/new_testing_api_topology.c
+ * @file testing/testbed_api_topology.c
  * @brief topology-generation functions
  * @author Christian Grothoff
  */
 #include "platform.h"
-#include "gnunet_testing_service.h"
+#include "gnunet_testbed_service.h"
 
 
 /**
@@ -124,4 +124,4 @@
   return NULL;
 }
 
-/* end of new_testing_api_topology.c */
+/* end of testbed_api_topology.c */

Modified: gnunet/src/testing/Makefile.am
===================================================================
--- gnunet/src/testing/Makefile.am      2012-05-05 15:51:11 UTC (rev 21278)
+++ gnunet/src/testing/Makefile.am      2012-05-05 15:52:36 UTC (rev 21279)
@@ -34,29 +34,8 @@
 endif
 
 lib_LTLIBRARIES = \
-  libgnunettesting.la \
-  libgnunettesting_new.la
+  libgnunettesting.la 
 
-libgnunettesting_new_la_SOURCES = \
-  new_testing_api.c new_testing.h \
-  new_testing_api_hosts.c new_testing_api_hosts.h \
-  new_testing_api_operations.c new_testing_api_operations.h \
-  new_testing_api_peers.c new_testing_api_peers.h \
-  new_testing_api_services.c \
-  new_testing_api_testbed.c \
-  new_testing_api_test.c \
-  new_testing_api_topology.c
-libgnunettesting_new_la_LIBADD = $(XLIB) \
- $(top_builddir)/src/core/libgnunetcore.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/transport/libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- -lm \
- $(top_builddir)/src/util/libgnunetutil.la 
-libgnunettesting_new_la_LDFLAGS = \
- $(GN_LIB_LDFLAGS) \
- -version-info 0:0:0
-
 libgnunettesting_la_SOURCES = \
   helper.c \
   testing.c  \