aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-07-24 11:30:44 +0000
committerChristian Grothoff <christian@grothoff.org>2011-07-24 11:30:44 +0000
commit7f935fa396f06a7b2bfa02549ff833316c7c9022 (patch)
tree2e7079363466eeb51ec52c58c7bb0930e0c2c424 /src
parent9761be954b27ef3ba33d39c1576535af8a7e00b6 (diff)
downloadgnunet-7f935fa396f06a7b2bfa02549ff833316c7c9022.tar.gz
gnunet-7f935fa396f06a7b2bfa02549ff833316c7c9022.zip
fix
Diffstat (limited to 'src')
-rw-r--r--src/nse/Makefile.am16
-rw-r--r--src/nse/nse-profiler.c2
-rw-r--r--src/nse/test_nse_multipeer.c2
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 = \
23 23
24 24
25bin_PROGRAMS = \ 25bin_PROGRAMS = \
26 gnunet-service-nse \ 26 gnunet-service-nse
27
28noinst_PROGRAMS = \
27 nse-profiler 29 nse-profiler
28 30
29nse_profiler_SOURCES = \ 31nse_profiler_SOURCES = \
@@ -48,12 +50,17 @@ gnunet_service_nse_LDADD = \
48gnunet_service_nse_DEPENDENCIES = \ 50gnunet_service_nse_DEPENDENCIES = \
49 libgnunetnse.la 51 libgnunetnse.la
50 52
53if HAVE_BENCHMARKS
54 MULTIPEER_TEST = test_nse_multipeer
55endif
56
51check_PROGRAMS = \ 57check_PROGRAMS = \
52 test_nse_api \ 58 test_nse_api \
53 test_nse_multipeer 59 $(MULTIPEER_TEST)
60
54 61
55if ENABLE_TEST_RUN 62if ENABLE_TEST_RUN
56TESTS = $(check_PROGRAMS) $(check_SCRIPTS) 63TESTS = $(check_PROGRAMS)
57endif 64endif
58 65
59test_nse_api_SOURCES = \ 66test_nse_api_SOURCES = \
@@ -70,7 +77,6 @@ test_nse_multipeer_LDADD = \
70 $(top_builddir)/src/testing/libgnunettesting.la 77 $(top_builddir)/src/testing/libgnunettesting.la
71 78
72EXTRA_DIST = \ 79EXTRA_DIST = \
73 test_nse.conf \ 80 test_nse.conf
74 $(check_SCRIPTS)
75 81
76 82
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 @@
1/* 1/*
2 This file is part of GNUnet. 2 This file is part of GNUnet.
3 (C) 2009 Christian Grothoff (and other contributing authors) 3 (C) 2011 Christian Grothoff (and other contributing authors)
4 4
5 GNUnet is free software; you can redistribute it and/or modify 5 GNUnet is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published 6 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;
51/** 51/**
52 * How long do we run the test? 52 * How long do we run the test?
53 */ 53 */
54#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 5) 54#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 2)
55 55
56static int ok; 56static int ok;
57 57