[GNUnet-SVN] r16157 - gnunet/src/nse

[gnunet]

Author: grothoff
Date: 2011-07-24 13:30:44 +0200 (Sun, 24 Jul 2011)
New Revision: 16157

Modified:
   gnunet/src/nse/Makefile.am
   gnunet/src/nse/nse-profiler.c
   gnunet/src/nse/test_nse_multipeer.c
Log:
fix

Modified: gnunet/src/nse/Makefile.am
===================================================================
--- gnunet/src/nse/Makefile.am  2011-07-23 21:06:27 UTC (rev 16156)
+++ gnunet/src/nse/Makefile.am  2011-07-24 11:30:44 UTC (rev 16157)
@@ -23,7 +23,9 @@
 
 
 bin_PROGRAMS = \
- gnunet-service-nse \
+ gnunet-service-nse 
+
+noinst_PROGRAMS = \
  nse-profiler
 
 nse_profiler_SOURCES = \
@@ -48,12 +50,17 @@
 gnunet_service_nse_DEPENDENCIES = \
   libgnunetnse.la                               
 
+if HAVE_BENCHMARKS
+  MULTIPEER_TEST = test_nse_multipeer
+endif
+
 check_PROGRAMS = \
  test_nse_api \
- test_nse_multipeer
+ $(MULTIPEER_TEST)
 
+
 if ENABLE_TEST_RUN
-TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
+TESTS = $(check_PROGRAMS) 
 endif
 
 test_nse_api_SOURCES = \
@@ -70,7 +77,6 @@
   $(top_builddir)/src/testing/libgnunettesting.la
 
 EXTRA_DIST = \
-  test_nse.conf \
-  $(check_SCRIPTS) 
+  test_nse.conf 
 
 

Modified: gnunet/src/nse/nse-profiler.c
===================================================================
--- gnunet/src/nse/nse-profiler.c       2011-07-23 21:06:27 UTC (rev 16156)
+++ gnunet/src/nse/nse-profiler.c       2011-07-24 11:30:44 UTC (rev 16157)
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2009 Christian Grothoff (and other contributing authors)
+     (C) 2011 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published

Modified: gnunet/src/nse/test_nse_multipeer.c
===================================================================
--- gnunet/src/nse/test_nse_multipeer.c 2011-07-23 21:06:27 UTC (rev 16156)
+++ gnunet/src/nse/test_nse_multipeer.c 2011-07-24 11:30:44 UTC (rev 16157)
@@ -51,7 +51,7 @@
 /**
  * How long do we run the test?
  */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 5)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 2)
 
 static int ok;