commit 852718c2473e41bc01ada0d53ad93c7da78e6ec8 parent 65dbd214b80664872f6514fdd663a30e405a6ad6 Author: Martin Schanzenbach <schanzen@gnunet.org> Date: Wed, 18 Oct 2023 17:24:47 +0200 BUILD: build plugins after services Diffstat:
42 files changed, 49 insertions(+), 26 deletions(-)
diff --git a/configure.ac b/configure.ac @@ -1237,7 +1237,6 @@ src/lib/gnsrecord/Makefile src/lib/json/Makefile src/lib/pq/Makefile src/lib/sq/Makefile -src/lib/testing/Makefile src/plugin/Makefile src/plugin/block/Makefile src/plugin/dhtu/Makefile @@ -1250,6 +1249,7 @@ src/service/core/core.conf src/service/identity/Makefile src/service/identity/identity.conf src/service/rest/Makefile +src/service/testing/Makefile src/service/util/Makefile src/rest-plugin/Makefile src/rest-plugin/identity/Makefile diff --git a/po/POTFILES.in b/po/POTFILES.in @@ -193,28 +193,6 @@ src/lib/sq/sq_exec.c src/lib/sq/sq_prepare.c src/lib/sq/sq_query_helper.c src/lib/sq/sq_result_helper.c -src/lib/testing/gnunet-cmds-helper.c -src/lib/testing/gnunet-testing.c -src/lib/testing/list-keys.c -src/lib/testing/testing.c -src/lib/testing/testing_api_cmd_barrier.c -src/lib/testing/testing_api_cmd_barrier_reached.c -src/lib/testing/testing_api_cmd_batch.c -src/lib/testing/testing_api_cmd_block_until_external_trigger.c -src/lib/testing/testing_api_cmd_exec_bash_script.c -src/lib/testing/testing_api_cmd_finish.c -src/lib/testing/testing_api_cmd_local_test_prepared.c -src/lib/testing/testing_api_cmd_netjail_start.c -src/lib/testing/testing_api_cmd_netjail_start_cmds_helper.c -src/lib/testing/testing_api_cmd_netjail_stop.c -src/lib/testing/testing_api_cmd_netjail_stop_cmds_helper.c -src/lib/testing/testing_api_cmd_send_peer_ready.c -src/lib/testing/testing_api_cmd_start_peer.c -src/lib/testing/testing_api_cmd_stop_peer.c -src/lib/testing/testing_api_cmd_system_create.c -src/lib/testing/testing_api_cmd_system_destroy.c -src/lib/testing/testing_api_loop.c -src/lib/testing/testing_api_traits.c src/lib/util/bandwidth.c src/lib/util/benchmark.c src/lib/util/bio.c @@ -438,6 +416,28 @@ src/service/identity/identity_api_lookup.c src/service/identity/identity_api_suffix_lookup.c src/service/rest/gnunet-rest-server.c src/service/rest/rest.c +src/service/testing/gnunet-cmds-helper.c +src/service/testing/gnunet-testing.c +src/service/testing/list-keys.c +src/service/testing/testing.c +src/service/testing/testing_api_cmd_barrier.c +src/service/testing/testing_api_cmd_barrier_reached.c +src/service/testing/testing_api_cmd_batch.c +src/service/testing/testing_api_cmd_block_until_external_trigger.c +src/service/testing/testing_api_cmd_exec_bash_script.c +src/service/testing/testing_api_cmd_finish.c +src/service/testing/testing_api_cmd_local_test_prepared.c +src/service/testing/testing_api_cmd_netjail_start.c +src/service/testing/testing_api_cmd_netjail_start_cmds_helper.c +src/service/testing/testing_api_cmd_netjail_stop.c +src/service/testing/testing_api_cmd_netjail_stop_cmds_helper.c +src/service/testing/testing_api_cmd_send_peer_ready.c +src/service/testing/testing_api_cmd_start_peer.c +src/service/testing/testing_api_cmd_stop_peer.c +src/service/testing/testing_api_cmd_system_create.c +src/service/testing/testing_api_cmd_system_destroy.c +src/service/testing/testing_api_loop.c +src/service/testing/testing_api_traits.c src/service/util/gnunet-service-resolver.c src/set/gnunet-service-set.c src/set/gnunet-service-set_intersection.c @@ -466,6 +466,29 @@ src/statistics/gnunet-statistics.c src/statistics/statistics_api.c src/template/gnunet-service-template.c src/template/gnunet-template.c +src/test/dhtu/testing_dhtu_cmd_send.c +src/test/testing/gnunet-cmds-helper.c +src/test/testing/gnunet-testing.c +src/test/testing/list-keys.c +src/test/testing/testing.c +src/test/testing/testing_api_cmd_barrier.c +src/test/testing/testing_api_cmd_barrier_reached.c +src/test/testing/testing_api_cmd_batch.c +src/test/testing/testing_api_cmd_block_until_external_trigger.c +src/test/testing/testing_api_cmd_exec_bash_script.c +src/test/testing/testing_api_cmd_finish.c +src/test/testing/testing_api_cmd_local_test_prepared.c +src/test/testing/testing_api_cmd_netjail_start.c +src/test/testing/testing_api_cmd_netjail_start_cmds_helper.c +src/test/testing/testing_api_cmd_netjail_stop.c +src/test/testing/testing_api_cmd_netjail_stop_cmds_helper.c +src/test/testing/testing_api_cmd_send_peer_ready.c +src/test/testing/testing_api_cmd_start_peer.c +src/test/testing/testing_api_cmd_stop_peer.c +src/test/testing/testing_api_cmd_system_create.c +src/test/testing/testing_api_cmd_system_destroy.c +src/test/testing/testing_api_loop.c +src/test/testing/testing_api_traits.c src/topology/gnunet-daemon-topology.c src/transport/gnunet-communicator-quic.c src/transport/gnunet-communicator-tcp.c diff --git a/src/Makefile.am b/src/Makefile.am @@ -12,8 +12,8 @@ endif SUBDIRS = \ include $(INTLEMU_SUBDIRS) \ lib \ - plugin \ service \ + plugin \ rest-plugin \ cli \ contrib \ diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am @@ -10,5 +10,4 @@ SUBDIRS = \ curl \ json \ sq \ - $(POSTGRES_DIR) \ - testing + $(POSTGRES_DIR) diff --git a/src/service/Makefile.am b/src/service/Makefile.am @@ -2,5 +2,6 @@ SUBDIRS = \ util \ arm \ core \ + testing \ identity \ rest diff --git a/src/lib/testing/.gitignore b/src/service/testing/.gitignore diff --git a/src/lib/testing/Makefile.am b/src/service/testing/Makefile.am diff --git a/src/lib/testing/gnunet-cmds-helper.c b/src/service/testing/gnunet-cmds-helper.c diff --git a/src/lib/testing/gnunet-testing.c b/src/service/testing/gnunet-testing.c diff --git a/src/lib/testing/list-keys.c b/src/service/testing/list-keys.c diff --git a/src/lib/testing/meson.build b/src/service/testing/meson.build diff --git a/src/lib/testing/test_testing_defaults.conf b/src/service/testing/test_testing_defaults.conf diff --git a/src/lib/testing/test_testing_peerstartup.c b/src/service/testing/test_testing_peerstartup.c diff --git a/src/lib/testing/test_testing_peerstartup2.c b/src/service/testing/test_testing_peerstartup2.c diff --git a/src/lib/testing/test_testing_portreservation.c b/src/service/testing/test_testing_portreservation.c diff --git a/src/lib/testing/test_testing_servicestartup.c b/src/service/testing/test_testing_servicestartup.c diff --git a/src/lib/testing/test_testing_sharedservices.c b/src/service/testing/test_testing_sharedservices.c diff --git a/src/lib/testing/test_testing_sharedservices.conf b/src/service/testing/test_testing_sharedservices.conf diff --git a/src/lib/testing/test_testing_start_with_config.c b/src/service/testing/test_testing_start_with_config.c diff --git a/src/lib/testing/testing.c b/src/service/testing/testing.c diff --git a/src/lib/testing/testing.conf b/src/service/testing/testing.conf diff --git a/src/lib/testing/testing.h b/src/service/testing/testing.h diff --git a/src/lib/testing/testing_api_cmd_barrier.c b/src/service/testing/testing_api_cmd_barrier.c diff --git a/src/lib/testing/testing_api_cmd_barrier_reached.c b/src/service/testing/testing_api_cmd_barrier_reached.c diff --git a/src/lib/testing/testing_api_cmd_batch.c b/src/service/testing/testing_api_cmd_batch.c diff --git a/src/lib/testing/testing_api_cmd_block_until_external_trigger.c b/src/service/testing/testing_api_cmd_block_until_external_trigger.c diff --git a/src/lib/testing/testing_api_cmd_exec_bash_script.c b/src/service/testing/testing_api_cmd_exec_bash_script.c diff --git a/src/lib/testing/testing_api_cmd_finish.c b/src/service/testing/testing_api_cmd_finish.c diff --git a/src/lib/testing/testing_api_cmd_local_test_prepared.c b/src/service/testing/testing_api_cmd_local_test_prepared.c diff --git a/src/lib/testing/testing_api_cmd_netjail_start.c b/src/service/testing/testing_api_cmd_netjail_start.c diff --git a/src/lib/testing/testing_api_cmd_netjail_start_cmds_helper.c b/src/service/testing/testing_api_cmd_netjail_start_cmds_helper.c diff --git a/src/lib/testing/testing_api_cmd_netjail_stop.c b/src/service/testing/testing_api_cmd_netjail_stop.c diff --git a/src/lib/testing/testing_api_cmd_netjail_stop_cmds_helper.c b/src/service/testing/testing_api_cmd_netjail_stop_cmds_helper.c diff --git a/src/lib/testing/testing_api_cmd_send_peer_ready.c b/src/service/testing/testing_api_cmd_send_peer_ready.c diff --git a/src/lib/testing/testing_api_cmd_start_peer.c b/src/service/testing/testing_api_cmd_start_peer.c diff --git a/src/lib/testing/testing_api_cmd_stop_peer.c b/src/service/testing/testing_api_cmd_stop_peer.c diff --git a/src/lib/testing/testing_api_cmd_system_create.c b/src/service/testing/testing_api_cmd_system_create.c diff --git a/src/lib/testing/testing_api_cmd_system_destroy.c b/src/service/testing/testing_api_cmd_system_destroy.c diff --git a/src/lib/testing/testing_api_loop.c b/src/service/testing/testing_api_loop.c diff --git a/src/lib/testing/testing_api_traits.c b/src/service/testing/testing_api_traits.c diff --git a/src/lib/testing/testing_cmds.h b/src/service/testing/testing_cmds.h diff --git a/src/lib/testing/topo.sh b/src/service/testing/topo.sh