From 7f935fa396f06a7b2bfa02549ff833316c7c9022 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sun, 24 Jul 2011 11:30:44 +0000 Subject: [PATCH] fix --- src/nse/Makefile.am | 16 +++++++++++----- src/nse/nse-profiler.c | 2 +- src/nse/test_nse_multipeer.c | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/nse/Makefile.am b/src/nse/Makefile.am index a58dd3692..05877b5c4 100644 --- a/src/nse/Makefile.am +++ b/src/nse/Makefile.am @@ -23,7 +23,9 @@ libgnunetnse_la_LDFLAGS = \ bin_PROGRAMS = \ - gnunet-service-nse \ + gnunet-service-nse + +noinst_PROGRAMS = \ nse-profiler nse_profiler_SOURCES = \ @@ -48,12 +50,17 @@ gnunet_service_nse_LDADD = \ 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 @@ test_nse_multipeer_LDADD = \ $(top_builddir)/src/testing/libgnunettesting.la EXTRA_DIST = \ - test_nse.conf \ - $(check_SCRIPTS) + test_nse.conf diff --git a/src/nse/nse-profiler.c b/src/nse/nse-profiler.c index 2dbb4cfed..fd145b4d9 100644 --- a/src/nse/nse-profiler.c +++ b/src/nse/nse-profiler.c @@ -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 diff --git a/src/nse/test_nse_multipeer.c b/src/nse/test_nse_multipeer.c index c277fdf7b..d06ec7c30 100644 --- a/src/nse/test_nse_multipeer.c +++ b/src/nse/test_nse_multipeer.c @@ -51,7 +51,7 @@ struct NSEPeer *peer_tail; /** * 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; -- 2.25.1