diff options
author | Christian Grothoff <christian@grothoff.org> | 2016-06-24 14:05:58 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2016-06-24 14:05:58 +0000 |
commit | 71c68d0bbdb546bfe84b4536b447899c53cb3812 (patch) | |
tree | cbde440932f0b8c038a6559f880a9ecb0de719d9 | |
parent | 7093450cf4d9e0654a128aaff442fc6f6809326e (diff) | |
download | gnunet-71c68d0bbdb546bfe84b4536b447899c53cb3812.tar.gz gnunet-71c68d0bbdb546bfe84b4536b447899c53cb3812.zip |
move testbed logger to its own directory
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | po/POTFILES.in | 7 | ||||
-rw-r--r-- | src/Makefile.am | 2 | ||||
-rw-r--r-- | src/nse/Makefile.am | 4 | ||||
-rw-r--r-- | src/testbed-logger/Makefile.am | 57 | ||||
-rw-r--r-- | src/testbed-logger/gnunet-service-testbed-logger.c (renamed from src/testbed/gnunet-service-testbed-logger.c) | 2 | ||||
-rw-r--r-- | src/testbed-logger/test_testbed_logger_api.c (renamed from src/testbed/test_testbed_logger_api.c) | 2 | ||||
-rw-r--r-- | src/testbed-logger/test_testbed_logger_api.conf (renamed from src/testbed/test_testbed_logger_api.conf) | 0 | ||||
-rw-r--r-- | src/testbed-logger/testbed-logger.conf.in | 127 | ||||
-rw-r--r-- | src/testbed-logger/testbed_logger_api.c (renamed from src/testbed/testbed_logger_api.c) | 2 | ||||
-rw-r--r-- | src/testbed/Makefile.am | 28 | ||||
-rw-r--r-- | src/testbed/testbed.conf.in | 11 |
12 files changed, 196 insertions, 48 deletions
diff --git a/configure.ac b/configure.ac index 11e9cbf3c..e4d3fa6a1 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1601,6 +1601,8 @@ src/statistics/statistics.conf | |||
1601 | src/template/Makefile | 1601 | src/template/Makefile |
1602 | src/testbed/Makefile | 1602 | src/testbed/Makefile |
1603 | src/testbed/testbed.conf | 1603 | src/testbed/testbed.conf |
1604 | src/testbed-logger/Makefile | ||
1605 | src/testbed-logger/testbed-logger.conf | ||
1604 | src/testing/Makefile | 1606 | src/testing/Makefile |
1605 | src/topology/Makefile | 1607 | src/topology/Makefile |
1606 | src/transport/Makefile | 1608 | src/transport/Makefile |
diff --git a/po/POTFILES.in b/po/POTFILES.in index e854ef48a..97732d8b4 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in | |||
@@ -289,7 +289,8 @@ src/regex/gnunet-regex-simulation-profiler.c | |||
289 | src/regex/gnunet-service-regex.c | 289 | src/regex/gnunet-service-regex.c |
290 | src/regex/perf-regex.c | 290 | src/regex/perf-regex.c |
291 | src/regex/plugin_block_regex.c | 291 | src/regex/plugin_block_regex.c |
292 | src/regex/regex_api.c | 292 | src/regex/regex_api_announce.c |
293 | src/regex/regex_api_search.c | ||
293 | src/regex/regex_block_lib.c | 294 | src/regex/regex_block_lib.c |
294 | src/regex/regex_internal.c | 295 | src/regex/regex_internal.c |
295 | src/regex/regex_internal_dht.c | 296 | src/regex/regex_internal_dht.c |
@@ -350,12 +351,13 @@ src/testbed/gnunet-service-testbed_cache.c | |||
350 | src/testbed/gnunet-service-testbed_connectionpool.c | 351 | src/testbed/gnunet-service-testbed_connectionpool.c |
351 | src/testbed/gnunet-service-testbed_cpustatus.c | 352 | src/testbed/gnunet-service-testbed_cpustatus.c |
352 | src/testbed/gnunet-service-testbed_links.c | 353 | src/testbed/gnunet-service-testbed_links.c |
353 | src/testbed/gnunet-service-testbed-logger.c | ||
354 | src/testbed/gnunet-service-testbed_meminfo.c | 354 | src/testbed/gnunet-service-testbed_meminfo.c |
355 | src/testbed/gnunet-service-testbed_oc.c | 355 | src/testbed/gnunet-service-testbed_oc.c |
356 | src/testbed/gnunet-service-testbed_peers.c | 356 | src/testbed/gnunet-service-testbed_peers.c |
357 | src/testbed/gnunet_testbed_mpi_spawn.c | 357 | src/testbed/gnunet_testbed_mpi_spawn.c |
358 | src/testbed/gnunet-testbed-profiler.c | 358 | src/testbed/gnunet-testbed-profiler.c |
359 | src/testbed-logger/gnunet-service-testbed-logger.c | ||
360 | src/testbed-logger/testbed_logger_api.c | ||
359 | src/testbed/testbed_api_barriers.c | 361 | src/testbed/testbed_api_barriers.c |
360 | src/testbed/testbed_api.c | 362 | src/testbed/testbed_api.c |
361 | src/testbed/testbed_api_hosts.c | 363 | src/testbed/testbed_api_hosts.c |
@@ -368,7 +370,6 @@ src/testbed/testbed_api_testbed.c | |||
368 | src/testbed/testbed_api_test.c | 370 | src/testbed/testbed_api_test.c |
369 | src/testbed/testbed_api_topology.c | 371 | src/testbed/testbed_api_topology.c |
370 | src/testbed/testbed_api_underlay.c | 372 | src/testbed/testbed_api_underlay.c |
371 | src/testbed/testbed_logger_api.c | ||
372 | src/testing/gnunet-testing.c | 373 | src/testing/gnunet-testing.c |
373 | src/testing/list-keys.c | 374 | src/testing/list-keys.c |
374 | src/testing/testing.c | 375 | src/testing/testing.c |
diff --git a/src/Makefile.am b/src/Makefile.am index 24c2f583a..0ce2ac4de 100644 --- a/src/Makefile.am +++ b/src/Makefile.am | |||
@@ -5,7 +5,7 @@ | |||
5 | 5 | ||
6 | if HAVE_TESTING | 6 | if HAVE_TESTING |
7 | TESTING = testing | 7 | TESTING = testing |
8 | TESTBED = testbed | 8 | TESTBED = testbed-logger testbed |
9 | CONSENSUS = consensus | 9 | CONSENSUS = consensus |
10 | SECRETSHARING = secretsharing | 10 | SECRETSHARING = secretsharing |
11 | endif | 11 | endif |
diff --git a/src/nse/Makefile.am b/src/nse/Makefile.am index ebff9d251..9a163b160 100644 --- a/src/nse/Makefile.am +++ b/src/nse/Makefile.am | |||
@@ -66,7 +66,7 @@ gnunet_service_nse_LDADD = \ | |||
66 | $(GN_LIBINTL) | 66 | $(GN_LIBINTL) |
67 | if ENABLE_NSE_HISTOGRAM | 67 | if ENABLE_NSE_HISTOGRAM |
68 | gnunet_service_nse_LDADD += \ | 68 | gnunet_service_nse_LDADD += \ |
69 | $(top_builddir)/src/testbed/libgnunettestbedlogger.la | 69 | $(top_builddir)/src/testbed-logger/libgnunettestbedlogger.la |
70 | endif | 70 | endif |
71 | 71 | ||
72 | 72 | ||
@@ -111,5 +111,3 @@ perf_kdf_LDADD = \ | |||
111 | EXTRA_DIST = \ | 111 | EXTRA_DIST = \ |
112 | test_nse.conf \ | 112 | test_nse.conf \ |
113 | nse_profiler_test.conf | 113 | nse_profiler_test.conf |
114 | |||
115 | |||
diff --git a/src/testbed-logger/Makefile.am b/src/testbed-logger/Makefile.am new file mode 100644 index 000000000..7f372fd02 --- /dev/null +++ b/src/testbed-logger/Makefile.am | |||
@@ -0,0 +1,57 @@ | |||
1 | # This Makefile.am is in the public domain | ||
2 | AM_CPPFLAGS = -I$(top_srcdir)/src/include | ||
3 | |||
4 | if MINGW | ||
5 | WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols | ||
6 | endif | ||
7 | |||
8 | if USE_COVERAGE | ||
9 | AM_CFLAGS = --coverage -O0 | ||
10 | XLIB = -lgcov | ||
11 | endif | ||
12 | |||
13 | libexecdir= $(pkglibdir)/libexec/ | ||
14 | |||
15 | pkgcfgdir= $(pkgdatadir)/config.d/ | ||
16 | |||
17 | pkgcfg_DATA = \ | ||
18 | testbed-logger.conf | ||
19 | |||
20 | libexec_PROGRAMS = \ | ||
21 | gnunet-service-testbed-logger | ||
22 | |||
23 | gnunet_service_testbed_logger_SOURCES = \ | ||
24 | gnunet-service-testbed-logger.c | ||
25 | gnunet_service_testbed_logger_LDADD = \ | ||
26 | $(top_builddir)/src/util/libgnunetutil.la | ||
27 | |||
28 | lib_LTLIBRARIES = \ | ||
29 | libgnunettestbedlogger.la | ||
30 | |||
31 | libgnunettestbedlogger_la_SOURCES = \ | ||
32 | testbed_logger_api.c | ||
33 | libgnunettestbedlogger_la_LIBADD = $(XLIB) \ | ||
34 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
35 | $(LTLIBINTL) | ||
36 | libgnunettestbedlogger_la_LDFLAGS = \ | ||
37 | $(GN_LIB_LDFLAGS) \ | ||
38 | -version-info 0:0:0 | ||
39 | |||
40 | check_PROGRAMS = \ | ||
41 | test_testbed_logger_api | ||
42 | |||
43 | if ENABLE_TEST_RUN | ||
44 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; | ||
45 | TESTS = \ | ||
46 | test_testbed_logger_api | ||
47 | endif | ||
48 | |||
49 | test_testbed_logger_api_SOURCES = \ | ||
50 | test_testbed_logger_api.c | ||
51 | test_testbed_logger_api_LDADD = \ | ||
52 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
53 | $(top_builddir)/src/testing/libgnunettesting.la \ | ||
54 | libgnunettestbedlogger.la | ||
55 | |||
56 | EXTRA_DIST = \ | ||
57 | test_testbed_logger_api.conf | ||
diff --git a/src/testbed/gnunet-service-testbed-logger.c b/src/testbed-logger/gnunet-service-testbed-logger.c index 0f9fab01b..1c250b306 100644 --- a/src/testbed/gnunet-service-testbed-logger.c +++ b/src/testbed-logger/gnunet-service-testbed-logger.c | |||
@@ -19,7 +19,7 @@ | |||
19 | */ | 19 | */ |
20 | 20 | ||
21 | /** | 21 | /** |
22 | * @file testbed/gnunet-service-testbed-logger.c | 22 | * @file testbed-logger/gnunet-service-testbed-logger.c |
23 | * @brief service for collecting messages and writing to a file | 23 | * @brief service for collecting messages and writing to a file |
24 | * @author Sree Harsha Totakura | 24 | * @author Sree Harsha Totakura |
25 | */ | 25 | */ |
diff --git a/src/testbed/test_testbed_logger_api.c b/src/testbed-logger/test_testbed_logger_api.c index a25c0c5f0..8f7391f22 100644 --- a/src/testbed/test_testbed_logger_api.c +++ b/src/testbed-logger/test_testbed_logger_api.c | |||
@@ -18,7 +18,7 @@ | |||
18 | Boston, MA 02110-1301, USA. | 18 | Boston, MA 02110-1301, USA. |
19 | */ | 19 | */ |
20 | /** | 20 | /** |
21 | * @file testbed/test_testbed_logger_api.c | 21 | * @file testbed-logger/test_testbed_logger_api.c |
22 | * @brief testcases for the testbed logger api | 22 | * @brief testcases for the testbed logger api |
23 | * @author Sree Harsha Totakura | 23 | * @author Sree Harsha Totakura |
24 | */ | 24 | */ |
diff --git a/src/testbed/test_testbed_logger_api.conf b/src/testbed-logger/test_testbed_logger_api.conf index 57ce5c254..57ce5c254 100644 --- a/src/testbed/test_testbed_logger_api.conf +++ b/src/testbed-logger/test_testbed_logger_api.conf | |||
diff --git a/src/testbed-logger/testbed-logger.conf.in b/src/testbed-logger/testbed-logger.conf.in new file mode 100644 index 000000000..094328c7b --- /dev/null +++ b/src/testbed-logger/testbed-logger.conf.in | |||
@@ -0,0 +1,127 @@ | |||
1 | [testbed] | ||
2 | AUTOSTART = NO | ||
3 | @JAVAPORT@ PORT = 2101 | ||
4 | HOSTNAME = localhost | ||
5 | BINARY = gnunet-service-testbed | ||
6 | |||
7 | # How long should operations wait? | ||
8 | OPERATION_TIMEOUT = 30 s | ||
9 | |||
10 | # Set this to the path where the testbed helper is installed. By default the | ||
11 | # helper binary is searched in @prefix@/lib/gnunet/libexec/ | ||
12 | # HELPER_BINARY_PATH = @prefix@/lib/gnunet/libexec/gnunet-helper-testbed | ||
13 | |||
14 | # Add your local network address here. For example, if you want to run | ||
15 | # testbed on a group of hosts connected to network 192.168.1.0/24, then set | ||
16 | # ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24; | ||
17 | # Multiple network addresses can be given. They should be separated by `;' | ||
18 | ACCEPT_FROM = 127.0.0.1; | ||
19 | ACCEPT_FROM6 = ::1; | ||
20 | |||
21 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-testbed.sock | ||
22 | UNIX_MATCH_UID = YES | ||
23 | UNIX_MATCH_GID = YES | ||
24 | |||
25 | # How many maximum number of operations can be run in parallel. This number | ||
26 | # should be decreased if the system is getting overloaded and to reduce the load | ||
27 | # exerted by the emulation. | ||
28 | MAX_PARALLEL_OPERATIONS = 1000 | ||
29 | MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 1 | ||
30 | |||
31 | # What topology should be generated by the helper functions GNUNET_TESTBED_run() | ||
32 | # and GNUNET_TESTBED_test_run(). This option has no effect if testbed is | ||
33 | # initialized with other functions. Valid values can be found at: | ||
34 | # https://gnunet.org/supported-topologies | ||
35 | OVERLAY_TOPOLOGY = NONE | ||
36 | |||
37 | # Number of random links to be included to the generate the above topology. | ||
38 | # Note that not all topologies require this option and ignore it. Topologies | ||
39 | # requiring this option are RANDOM, SMALL_WORLD and SMALL_WORLD ring. | ||
40 | # OVERLAY_RANDOM_LINKS = | ||
41 | |||
42 | # This option is required if the OVERLAY_TOPOLOGY is set to FROM_FILE. It is | ||
43 | # ignored for all other topologies. This option should contain the path to | ||
44 | # the file containing the topology information. The format of the file is | ||
45 | # presented at: https://gnunet.org/topology-file-format | ||
46 | # OVERLAY_TOPOLOGY_FILE = /path/to/topology-file | ||
47 | |||
48 | # The following options are required if the OVERLAY_TOPOLOGY is set to | ||
49 | # SCALE_FREE. They are ignored in all other cases. | ||
50 | # The number of maximum peers which can connect to a peer | ||
51 | SCALE_FREE_TOPOLOGY_CAP = 70 | ||
52 | # The minimum number of peers which a peer has to connect | ||
53 | SCALE_FREE_TOPOLOGY_M = 5 | ||
54 | |||
55 | # How many maximum number of handles to peers' services should be kept open at | ||
56 | # any time. This number also keeps a check on the number of open descriptors as | ||
57 | # opening a service connection results in opening a file descriptor. | ||
58 | MAX_PARALLEL_SERVICE_CONNECTIONS = 256 | ||
59 | |||
60 | # Size of the internal testbed cache. It is used to cache handles to peers | ||
61 | # while trying to connect them. | ||
62 | CACHE_SIZE = 30 | ||
63 | |||
64 | # Maximum number of file descriptors a testbed controller is permitted to keep | ||
65 | # open. | ||
66 | MAX_OPEN_FDS = 512 | ||
67 | |||
68 | # How long should we wait for testbed to setup while using helper functions | ||
69 | # GNUNET_TESTBED_test_run() and GNUNET_TESTBED_run() | ||
70 | SETUP_TIMEOUT = 5 m | ||
71 | |||
72 | # Where should testbed write load statistics data | ||
73 | # STATS_DIR = /tmp/load | ||
74 | |||
75 | # What services should be shared among peers. | ||
76 | # Format is "[<service:share>] [<service:share>] ...". The shared services are | ||
77 | # started standalone without any other peer services or a hostkey. For this | ||
78 | # reason, only services which doesn't depend on other services can only be | ||
79 | # shared. Example: To share peerinfo among every 10 peers. The following spec | ||
80 | # will start 5 peerinfo services when 50 peers are started: | ||
81 | # | ||
82 | # SHARED_SERVICES = peerinfo:10 | ||
83 | # | ||
84 | # To share multiple services | ||
85 | # | ||
86 | # SHARED_SERVICES = service1:n_share1 service2:n_share2 ... | ||
87 | # | ||
88 | # Default is to share no services | ||
89 | SHARED_SERVICES = | ||
90 | |||
91 | |||
92 | [testbed-logger] | ||
93 | AUTOSTART = NO | ||
94 | @UNIXONLY@ PORT = 2102 | ||
95 | HOSTNAME = localhost | ||
96 | BINARY = gnunet-service-testbed-logger | ||
97 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-gnunet-testbed-logger.sock | ||
98 | DIR = /tmp | ||
99 | UNIX_MATCH_UID = YES | ||
100 | UNIX_MATCH_GID = YES | ||
101 | |||
102 | |||
103 | [testbed-barrier] | ||
104 | AUTOSTART = NO | ||
105 | @UNIXONLY@ PORT = 2103 | ||
106 | HOSTNAME = localhost | ||
107 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-testbed-barrier.sock | ||
108 | UNIX_MATCH_UID = YES | ||
109 | UNIX_MATCH_GID = YES | ||
110 | |||
111 | |||
112 | # This section is related to configuring underlay restrictions to simulate | ||
113 | # connectivity restrictions of NAT boxes | ||
114 | [testbed-underlay] | ||
115 | AUTOSTART = NO | ||
116 | NOARMBIND = YES | ||
117 | BINARY = gnunet-daemon-testbed-underlay | ||
118 | # The sqlite3 database file containing information about what underlay | ||
119 | # restrictions to apply | ||
120 | # DBFILE = | ||
121 | |||
122 | [latency-logger] | ||
123 | AUTOSTART = NO | ||
124 | NOARMBIND = YES | ||
125 | BINARY = gnunet-daemon-latency-logger | ||
126 | # The sqlite3 database file where the latency values are to be stored | ||
127 | # DBFILE = \ No newline at end of file | ||
diff --git a/src/testbed/testbed_logger_api.c b/src/testbed-logger/testbed_logger_api.c index aa182e21c..aaf18cd33 100644 --- a/src/testbed/testbed_logger_api.c +++ b/src/testbed-logger/testbed_logger_api.c | |||
@@ -19,7 +19,7 @@ | |||
19 | */ | 19 | */ |
20 | 20 | ||
21 | /** | 21 | /** |
22 | * @file testbed/testbed_logger_api.c | 22 | * @file testbed-logger/testbed_logger_api.c |
23 | * @brief Client-side routines for communicating with the tesbted logger service | 23 | * @brief Client-side routines for communicating with the tesbted logger service |
24 | * @author Sree Harsha Totakura <sreeharsha@totakura.in> | 24 | * @author Sree Harsha Totakura <sreeharsha@totakura.in> |
25 | */ | 25 | */ |
diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am index 8b5d7457a..b5a7758f0 100644 --- a/src/testbed/Makefile.am +++ b/src/testbed/Makefile.am | |||
@@ -27,7 +27,6 @@ endif | |||
27 | libexec_PROGRAMS = \ | 27 | libexec_PROGRAMS = \ |
28 | gnunet-service-testbed \ | 28 | gnunet-service-testbed \ |
29 | gnunet-helper-testbed \ | 29 | gnunet-helper-testbed \ |
30 | gnunet-service-testbed-logger \ | ||
31 | gnunet-daemon-testbed-blacklist \ | 30 | gnunet-daemon-testbed-blacklist \ |
32 | $(underlay_daemon) \ | 31 | $(underlay_daemon) \ |
33 | $(latency_logger) | 32 | $(latency_logger) |
@@ -59,11 +58,6 @@ gnunet_service_testbed_LDADD = $(XLIB) \ | |||
59 | $(top_builddir)/src/arm/libgnunetarm.la \ | 58 | $(top_builddir)/src/arm/libgnunetarm.la \ |
60 | $(LTLIBINTL) $(Z_LIBS) | 59 | $(LTLIBINTL) $(Z_LIBS) |
61 | 60 | ||
62 | gnunet_service_testbed_logger_SOURCES = \ | ||
63 | gnunet-service-testbed-logger.c | ||
64 | gnunet_service_testbed_logger_LDADD = \ | ||
65 | $(top_builddir)/src/util/libgnunetutil.la | ||
66 | |||
67 | gnunet_testbed_profiler_SOURCES = \ | 61 | gnunet_testbed_profiler_SOURCES = \ |
68 | gnunet-testbed-profiler.c | 62 | gnunet-testbed-profiler.c |
69 | gnunet_testbed_profiler_LDADD = $(XLIB) \ | 63 | gnunet_testbed_profiler_LDADD = $(XLIB) \ |
@@ -97,8 +91,7 @@ gnunet_daemon_latency_logger_LDADD = $(XLIB) \ | |||
97 | $(LTLIBINTL) -lsqlite3 | 91 | $(LTLIBINTL) -lsqlite3 |
98 | 92 | ||
99 | lib_LTLIBRARIES = \ | 93 | lib_LTLIBRARIES = \ |
100 | libgnunettestbed.la \ | 94 | libgnunettestbed.la |
101 | libgnunettestbedlogger.la | ||
102 | 95 | ||
103 | libgnunettestbed_la_SOURCES = \ | 96 | libgnunettestbed_la_SOURCES = \ |
104 | testbed_api.c testbed_api.h testbed.h \ | 97 | testbed_api.c testbed_api.h testbed.h \ |
@@ -125,15 +118,6 @@ libgnunettestbed_la_LDFLAGS = \ | |||
125 | $(GN_LIB_LDFLAGS) \ | 118 | $(GN_LIB_LDFLAGS) \ |
126 | -version-info 0:0:0 | 119 | -version-info 0:0:0 |
127 | 120 | ||
128 | libgnunettestbedlogger_la_SOURCES = \ | ||
129 | testbed_logger_api.c | ||
130 | libgnunettestbedlogger_la_LIBADD = $(XLIB) \ | ||
131 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
132 | $(LTLIBINTL) | ||
133 | libgnunettestbedlogger_la_LDFLAGS = \ | ||
134 | $(GN_LIB_LDFLAGS) \ | ||
135 | -version-info 0:0:0 | ||
136 | |||
137 | generate_underlay_topology_SOURCES = generate-underlay-topology.c | 121 | generate_underlay_topology_SOURCES = generate-underlay-topology.c |
138 | generate_underlay_topology_LDADD = $(XLIB) \ | 122 | generate_underlay_topology_LDADD = $(XLIB) \ |
139 | $(top_builddir)/src/util/libgnunetutil.la \ | 123 | $(top_builddir)/src/util/libgnunetutil.la \ |
@@ -142,7 +126,6 @@ generate_underlay_topology_LDADD = $(XLIB) \ | |||
142 | 126 | ||
143 | check_PROGRAMS = \ | 127 | check_PROGRAMS = \ |
144 | test_testbed_api_hosts \ | 128 | test_testbed_api_hosts \ |
145 | test_testbed_logger_api \ | ||
146 | test_gnunet_helper_testbed \ | 129 | test_gnunet_helper_testbed \ |
147 | test_testbed_api_controllerlink \ | 130 | test_testbed_api_controllerlink \ |
148 | test_testbed_api_2peers_1controller \ | 131 | test_testbed_api_2peers_1controller \ |
@@ -176,7 +159,6 @@ if ENABLE_TEST_RUN | |||
176 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; | 159 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; |
177 | TESTS = \ | 160 | TESTS = \ |
178 | test_testbed_api \ | 161 | test_testbed_api \ |
179 | test_testbed_logger_api \ | ||
180 | test_testbed_api_sd \ | 162 | test_testbed_api_sd \ |
181 | test_testbed_api_operations \ | 163 | test_testbed_api_operations \ |
182 | test_testbed_api_hosts \ | 164 | test_testbed_api_hosts \ |
@@ -219,13 +201,6 @@ test_testbed_api_LDADD = \ | |||
219 | $(top_builddir)/src/arm/libgnunetarm.la \ | 201 | $(top_builddir)/src/arm/libgnunetarm.la \ |
220 | libgnunettestbed.la | 202 | libgnunettestbed.la |
221 | 203 | ||
222 | test_testbed_logger_api_SOURCES = \ | ||
223 | test_testbed_logger_api.c | ||
224 | test_testbed_logger_api_LDADD = \ | ||
225 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
226 | $(top_builddir)/src/testing/libgnunettesting.la \ | ||
227 | libgnunettestbedlogger.la | ||
228 | |||
229 | test_testbed_api_sd_SOURCES = \ | 204 | test_testbed_api_sd_SOURCES = \ |
230 | test_testbed_api_sd.c | 205 | test_testbed_api_sd.c |
231 | test_testbed_api_sd_LDADD = \ | 206 | test_testbed_api_sd_LDADD = \ |
@@ -398,7 +373,6 @@ EXTRA_DIST = \ | |||
398 | test_testbed_api_statistics.conf \ | 373 | test_testbed_api_statistics.conf \ |
399 | test_testbed_api_test_timeout.conf \ | 374 | test_testbed_api_test_timeout.conf \ |
400 | test_testbed_api_template.conf \ | 375 | test_testbed_api_template.conf \ |
401 | test_testbed_logger_api.conf \ | ||
402 | test_testbed_api_testbed_run_topologyring.conf \ | 376 | test_testbed_api_testbed_run_topologyring.conf \ |
403 | test_testbed_api_testbed_run_topologyclique.conf \ | 377 | test_testbed_api_testbed_run_topologyclique.conf \ |
404 | test_testbed_api_testbed_run_topologyline.conf \ | 378 | test_testbed_api_testbed_run_topologyline.conf \ |
diff --git a/src/testbed/testbed.conf.in b/src/testbed/testbed.conf.in index 094328c7b..86044fbfb 100644 --- a/src/testbed/testbed.conf.in +++ b/src/testbed/testbed.conf.in | |||
@@ -89,17 +89,6 @@ SETUP_TIMEOUT = 5 m | |||
89 | SHARED_SERVICES = | 89 | SHARED_SERVICES = |
90 | 90 | ||
91 | 91 | ||
92 | [testbed-logger] | ||
93 | AUTOSTART = NO | ||
94 | @UNIXONLY@ PORT = 2102 | ||
95 | HOSTNAME = localhost | ||
96 | BINARY = gnunet-service-testbed-logger | ||
97 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-gnunet-testbed-logger.sock | ||
98 | DIR = /tmp | ||
99 | UNIX_MATCH_UID = YES | ||
100 | UNIX_MATCH_GID = YES | ||
101 | |||
102 | |||
103 | [testbed-barrier] | 92 | [testbed-barrier] |
104 | AUTOSTART = NO | 93 | AUTOSTART = NO |
105 | @UNIXONLY@ PORT = 2103 | 94 | @UNIXONLY@ PORT = 2103 |