[GNUnet-SVN] r31991 - gnunet/src/ats-tests

[gnunet]

Author: wachs
Date: 2014-01-21 17:31:38 +0100 (Tue, 21 Jan 2014)
New Revision: 31991

Modified:
   gnunet/src/ats-tests/Makefile.am
   gnunet/src/ats-tests/ats-testing.c
   gnunet/src/ats-tests/perf_ats.c
Log:
fixes


Modified: gnunet/src/ats-tests/Makefile.am
===================================================================
--- gnunet/src/ats-tests/Makefile.am    2014-01-21 16:27:55 UTC (rev 31990)
+++ gnunet/src/ats-tests/Makefile.am    2014-01-21 16:31:38 UTC (rev 31991)
@@ -82,10 +82,14 @@
   perf_ats.c perf_ats_logging.c perf_ats.h
 perf_ats_proportional_core_none_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/ats-tests/libgnunetatstesting.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
   $(top_builddir)/src/ats/libgnunetats.la \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/transport/libgnunettransport.la
+perf_ats_proportional_core_DEPENDENCIES = \
+ $(top_builddir)/src/ats-tests/libgnunetatstesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la  
 
 perf_ats_proportional_transport_none_SOURCES = \
   perf_ats.c perf_ats_logging.c
@@ -96,7 +100,7 @@
   $(top_builddir)/src/ats/libgnunetats.la \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/transport/libgnunettransport.la
-gnunet_ats_sim_DEPENDENCIES = \
+perf_ats_proportional_transport_DEPENDENCIES = \
  $(top_builddir)/src/ats-tests/libgnunetatstesting.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 

Modified: gnunet/src/ats-tests/ats-testing.c
===================================================================
--- gnunet/src/ats-tests/ats-testing.c  2014-01-21 16:27:55 UTC (rev 31990)
+++ gnunet/src/ats-tests/ats-testing.c  2014-01-21 16:31:38 UTC (rev 31991)
@@ -794,6 +794,7 @@
   top->done_cb = done_cb;
   top->done_cb_cls = done_cb_cls;
   top->test_core = test_core;
+  top->transport_recv_cb = transport_recv_cb;
 
   top->mps = GNUNET_malloc (num_masters * sizeof (struct BenchmarkPeer));
   top->sps = GNUNET_malloc (num_slaves * sizeof (struct BenchmarkPeer));

Modified: gnunet/src/ats-tests/perf_ats.c
===================================================================
--- gnunet/src/ats-tests/perf_ats.c     2014-01-21 16:27:55 UTC (rev 31990)
+++ gnunet/src/ats-tests/perf_ats.c     2014-01-21 16:31:38 UTC (rev 31991)
@@ -428,7 +428,6 @@
                    const struct GNUNET_PeerIdentity * peer,
                    const struct GNUNET_MessageHeader * message)
 {
-  GNUNET_break (0);
   if (TEST_MESSAGE_SIZE != ntohs (message->size) ||
       (TEST_MESSAGE_TYPE_PING != ntohs (message->type) &&
       TEST_MESSAGE_TYPE_PONG != ntohs (message->type)))