diff options
author | Alessio Vanni <vannilla@firemail.cc> | 2021-09-07 14:50:20 +0200 |
---|---|---|
committer | Alessio Vanni <vannilla@firemail.cc> | 2021-09-07 14:50:20 +0200 |
commit | 6e1bb6601e21a3329950129b9dc39e05746e3b65 (patch) | |
tree | dfc20058c8b430ef37c059ec21c2905168a07084 /src/testbed/Makefile.am | |
parent | 382fc8faaf4ccccd870dc7e746a9f002f3f6cfd1 (diff) | |
parent | 3da9cbd621a98c885a0c633ddaec0a84aa8a8e66 (diff) | |
download | gnunet-6e1bb6601e21a3329950129b9dc39e05746e3b65.tar.gz gnunet-6e1bb6601e21a3329950129b9dc39e05746e3b65.zip |
-Merge branch 'master' into dev/vanni/build-info
Diffstat (limited to 'src/testbed/Makefile.am')
-rw-r--r-- | src/testbed/Makefile.am | 59 |
1 files changed, 2 insertions, 57 deletions
diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am index a9837daf5..11399e77c 100644 --- a/src/testbed/Makefile.am +++ b/src/testbed/Makefile.am | |||
@@ -23,8 +23,6 @@ if HAVE_SQLITE | |||
23 | endif | 23 | endif |
24 | 24 | ||
25 | libexec_PROGRAMS = \ | 25 | libexec_PROGRAMS = \ |
26 | gnunet-cmd \ | ||
27 | gnunet-cmds-helper \ | ||
28 | gnunet-service-testbed \ | 26 | gnunet-service-testbed \ |
29 | gnunet-helper-testbed \ | 27 | gnunet-helper-testbed \ |
30 | gnunet-daemon-testbed-blacklist \ | 28 | gnunet-daemon-testbed-blacklist \ |
@@ -37,20 +35,6 @@ bin_PROGRAMS = \ | |||
37 | noinst_PROGRAMS = \ | 35 | noinst_PROGRAMS = \ |
38 | $(generate_underlay) | 36 | $(generate_underlay) |
39 | 37 | ||
40 | plugin_LTLIBRARIES = \ | ||
41 | libgnunet_plugin_testcmd.la | ||
42 | |||
43 | libgnunet_plugin_testcmd_la_SOURCES = \ | ||
44 | plugin_testcmd.c | ||
45 | libgnunet_plugin_testcmd_la_LIBADD = \ | ||
46 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
47 | $(top_builddir)/src/testing/libgnunettesting.la \ | ||
48 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | ||
49 | libgnunettestbed.la \ | ||
50 | $(LTLIBINTL) | ||
51 | libgnunet_plugin_testcmd_la_LDFLAGS = \ | ||
52 | $(GN_PLUGIN_LDFLAGS) | ||
53 | |||
54 | gnunet_service_testbed_SOURCES = \ | 38 | gnunet_service_testbed_SOURCES = \ |
55 | gnunet-service-testbed.c gnunet-service-testbed.h \ | 39 | gnunet-service-testbed.c gnunet-service-testbed.h \ |
56 | gnunet-service-testbed_links.c gnunet-service-testbed_links.h \ | 40 | gnunet-service-testbed_links.c gnunet-service-testbed_links.h \ |
@@ -75,6 +59,7 @@ gnunet_service_testbed_LDADD = $(XLIB) \ | |||
75 | gnunet_testbed_profiler_SOURCES = \ | 59 | gnunet_testbed_profiler_SOURCES = \ |
76 | gnunet-testbed-profiler.c | 60 | gnunet-testbed-profiler.c |
77 | gnunet_testbed_profiler_LDADD = $(XLIB) \ | 61 | gnunet_testbed_profiler_LDADD = $(XLIB) \ |
62 | $(top_builddir)/src/testing/libgnunettesting.la \ | ||
78 | $(top_builddir)/src/util/libgnunetutil.la \ | 63 | $(top_builddir)/src/util/libgnunetutil.la \ |
79 | libgnunettestbed.la | 64 | libgnunettestbed.la |
80 | gnunet_testbed_profiler_LDFLAGS = \ | 65 | gnunet_testbed_profiler_LDFLAGS = \ |
@@ -88,23 +73,6 @@ gnunet_helper_testbed_LDADD = $(XLIB) \ | |||
88 | libgnunettestbed.la \ | 73 | libgnunettestbed.la \ |
89 | $(LTLIBINTL) $(Z_LIBS) | 74 | $(LTLIBINTL) $(Z_LIBS) |
90 | 75 | ||
91 | gnunet_cmd_SOURCES = \ | ||
92 | gnunet-cmd.c | ||
93 | gnunet_cmd_LDADD = $(XLIB) \ | ||
94 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
95 | $(top_builddir)/src/testing/libgnunettesting.la \ | ||
96 | libgnunettestbed.la \ | ||
97 | $(LTLIBINTL) $(Z_LIBS) | ||
98 | |||
99 | gnunet_cmds_helper_SOURCES = \ | ||
100 | gnunet-cmds-helper.c | ||
101 | gnunet_cmds_helper_LDADD = $(XLIB) \ | ||
102 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
103 | $(top_builddir)/src/testing/libgnunettesting.la \ | ||
104 | $(top_builddir)/src/transport/libgnunettransport.la \ | ||
105 | libgnunettestbed.la \ | ||
106 | $(LTLIBINTL) $(Z_LIBS) | ||
107 | |||
108 | gnunet_daemon_testbed_blacklist_SOURCES = gnunet-daemon-testbed-blacklist.c | 76 | gnunet_daemon_testbed_blacklist_SOURCES = gnunet-daemon-testbed-blacklist.c |
109 | gnunet_daemon_testbed_blacklist_LDADD = $(XLIB) \ | 77 | gnunet_daemon_testbed_blacklist_LDADD = $(XLIB) \ |
110 | $(top_builddir)/src/transport/libgnunettransport.la \ | 78 | $(top_builddir)/src/transport/libgnunettransport.la \ |
@@ -127,17 +95,8 @@ lib_LTLIBRARIES = \ | |||
127 | libgnunettestbed.la | 95 | libgnunettestbed.la |
128 | 96 | ||
129 | libgnunettestbed_la_SOURCES = \ | 97 | libgnunettestbed_la_SOURCES = \ |
130 | testbed_api_cmd_local_test_finished.c \ | ||
131 | testbed_api_cmd_send_peer_ready.c \ | ||
132 | testbed_api_cmd_block_until_all_peers_started.c \ | ||
133 | testbed_api_cmd_netjail_start.c \ | ||
134 | testbed_api_cmd_netjail_start_testbed.c \ | ||
135 | testbed_api_cmd_netjail_stop_testbed.c \ | ||
136 | testbed_api_cmd_netjail_stop.c \ | ||
137 | testbed_api.c testbed_api.h testbed.h \ | 98 | testbed_api.c testbed_api.h testbed.h \ |
138 | testbed_api_hosts.c testbed_api_hosts.h testbed_helper.h \ | 99 | testbed_api_hosts.c testbed_api_hosts.h testbed_helper.h \ |
139 | testbed_api_cmd_controller.c \ | ||
140 | testbed_api_cmd_peer.c \ | ||
141 | testbed_api_operations.c testbed_api_operations.h \ | 100 | testbed_api_operations.c testbed_api_operations.h \ |
142 | testbed_api_peers.c testbed_api_peers.h \ | 101 | testbed_api_peers.c testbed_api_peers.h \ |
143 | testbed_api_services.c \ | 102 | testbed_api_services.c \ |
@@ -156,24 +115,18 @@ libgnunettestbed_la_LIBADD = $(XLIB) \ | |||
156 | $(top_builddir)/src/arm/libgnunetarm.la \ | 115 | $(top_builddir)/src/arm/libgnunetarm.la \ |
157 | $(top_builddir)/src/util/libgnunetutil.la \ | 116 | $(top_builddir)/src/util/libgnunetutil.la \ |
158 | $(LTLIBINTL) | 117 | $(LTLIBINTL) |
159 | libgnunettestbed_la_DEPENDENCIES = \ | ||
160 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | ||
161 | $(top_builddir)/src/transport/libgnunettransport.la \ | ||
162 | $(top_builddir)/src/hello/libgnunethello.la \ | ||
163 | $(top_builddir)/src/testing/libgnunettesting.la \ | ||
164 | $(top_builddir)/src/util/libgnunetutil.la | ||
165 | libgnunettestbed_la_LDFLAGS = \ | 118 | libgnunettestbed_la_LDFLAGS = \ |
166 | $(GN_LIB_LDFLAGS) \ | 119 | $(GN_LIB_LDFLAGS) \ |
167 | -version-info 0:0:0 | 120 | -version-info 0:0:0 |
168 | 121 | ||
169 | generate_underlay_topology_SOURCES = generate-underlay-topology.c | 122 | generate_underlay_topology_SOURCES = generate-underlay-topology.c |
170 | generate_underlay_topology_LDADD = $(XLIB) \ | 123 | generate_underlay_topology_LDADD = $(XLIB) \ |
124 | $(top_builddir)/src/testing/libgnunettesting.la \ | ||
171 | $(top_builddir)/src/util/libgnunetutil.la \ | 125 | $(top_builddir)/src/util/libgnunetutil.la \ |
172 | libgnunettestbed.la \ | 126 | libgnunettestbed.la \ |
173 | $(LTLIBINTL) -lsqlite3 | 127 | $(LTLIBINTL) -lsqlite3 |
174 | 128 | ||
175 | check_PROGRAMS = \ | 129 | check_PROGRAMS = \ |
176 | test_testbed_api_cmd_netjail \ | ||
177 | test_testbed_api_hosts \ | 130 | test_testbed_api_hosts \ |
178 | test_gnunet_helper_testbed \ | 131 | test_gnunet_helper_testbed \ |
179 | test_testbed_api_controllerlink \ | 132 | test_testbed_api_controllerlink \ |
@@ -208,7 +161,6 @@ check_PROGRAMS = \ | |||
208 | if ENABLE_TEST_RUN | 161 | if ENABLE_TEST_RUN |
209 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; | 162 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; |
210 | TESTS = \ | 163 | TESTS = \ |
211 | test_testbed_api_cmd_netjail \ | ||
212 | test_testbed_api \ | 164 | test_testbed_api \ |
213 | test_testbed_api_sd \ | 165 | test_testbed_api_sd \ |
214 | test_testbed_api_operations \ | 166 | test_testbed_api_operations \ |
@@ -239,13 +191,6 @@ if ENABLE_TEST_RUN | |||
239 | $(underlay_testcases) | 191 | $(underlay_testcases) |
240 | endif | 192 | endif |
241 | 193 | ||
242 | test_testbed_api_cmd_netjail_SOURCES = \ | ||
243 | test_testbed_api_cmd_netjail.c | ||
244 | test_testbed_api_cmd_netjail_LDADD = \ | ||
245 | $(top_builddir)/src/testing/libgnunettesting.la \ | ||
246 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
247 | libgnunettestbed.la | ||
248 | |||
249 | test_testbed_api_SOURCES = \ | 194 | test_testbed_api_SOURCES = \ |
250 | test_testbed_api.c | 195 | test_testbed_api.c |
251 | test_testbed_api_LDADD = \ | 196 | test_testbed_api_LDADD = \ |