[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] branch master updated: meson/tests: Test order and fixes for na
|
From: |
gnunet |
|
Subject: |
[gnunet] branch master updated: meson/tests: Test order and fixes for namestore et al. |
|
Date: |
Wed, 08 Nov 2023 12:51:16 +0100 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a commit to branch master
in repository gnunet.
The following commit(s) were added to refs/heads/master by this push:
new 6e28a271a meson/tests: Test order and fixes for namestore et al.
new 43a65ce5c Merge branch 'master' of git+ssh://git.gnunet.org/gnunet
6e28a271a is described below
commit 6e28a271a81c3d010c29d3725ba5ba380ba81b12
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Wed Nov 8 12:50:24 2023 +0100
meson/tests: Test order and fixes for namestore et al.
---
meson.build | 1 +
src/plugin/namestore/Makefile.am | 360 +--------------------
src/plugin/namestore/meson.build | 27 ++
src/plugin/namestore/test_plugin_namestore.c | 1 -
src/service/namestore/Makefile.am | 347 ++++++++++++++++++++
src/service/namestore/meson.build | 56 ++++
.../namestore/perf_namestore_api_import.c | 2 +-
.../namestore/perf_namestore_api_postgres.conf | 0
.../namestore/perf_namestore_api_sqlite.conf | 0
.../namestore/perf_namestore_api_zone_iteration.c | 2 +-
src/{plugin => service}/namestore/test_common.c | 0
.../namestore/test_namestore_api.conf | 4 +-
.../namestore/test_namestore_api_edit_records.c | 0
.../namestore/test_namestore_api_lookup_nick.c | 0
.../namestore/test_namestore_api_monitoring.c | 2 +-
.../test_namestore_api_monitoring_existing.c | 2 +-
.../namestore/test_namestore_api_postgres.conf | 0
.../namestore/test_namestore_api_remove.c | 0
...test_namestore_api_remove_not_existing_record.c | 0
.../namestore/test_namestore_api_sqlite.conf | 0
.../namestore/test_namestore_api_store.c | 0
.../namestore/test_namestore_api_store_update.c | 0
.../namestore/test_namestore_api_tx_rollback.c | 0
.../namestore/test_namestore_api_zone_iteration.c | 2 +-
.../test_namestore_api_zone_iteration_nick.c | 2 +-
...st_namestore_api_zone_iteration_specific_zone.c | 2 +-
.../test_namestore_api_zone_iteration_stop.c | 2 +-
.../namestore/test_namestore_api_zone_to_name.c | 2 +-
src/service/util/meson.build | 13 +
src/service/util/test_resolver_api.c | 2 +-
30 files changed, 470 insertions(+), 359 deletions(-)
diff --git a/meson.build b/meson.build
index ba9e4b3c9..39ac14eb8 100644
--- a/meson.build
+++ b/meson.build
@@ -420,6 +420,7 @@ pkg = import('pkgconfig')
subdir('src')
subdir('doc')
subdir('contrib')
+subdir('data')
meson.add_dist_script('meson-dist-script')
diff --git a/src/plugin/namestore/Makefile.am b/src/plugin/namestore/Makefile.am
index 03b743d7a..3db174225 100644
--- a/src/plugin/namestore/Makefile.am
+++ b/src/plugin/namestore/Makefile.am
@@ -19,62 +19,7 @@ if USE_COVERAGE
endif
-if HAVE_SQLITE
-SQLITE_PLUGIN = libgnunet_plugin_namestore_sqlite.la
-SQLITE_TESTS = test_plugin_namestore_sqlite \
- test_namestore_api_store_sqlite \
- test_namestore_api_store_update_sqlite \
- test_namestore_api_zone_iteration_sqlite \
- test_namestore_api_remove_sqlite \
- test_namestore_api_lookup_nick_sqlite \
- test_namestore_api_monitoring_sqlite \
- test_namestore_api_remove_not_existing_record_sqlite \
- test_namestore_api_zone_iteration_nick_sqlite \
- test_namestore_api_zone_iteration_specific_zone_sqlite \
- test_namestore_api_zone_iteration_stop_sqlite \
- test_namestore_api_monitoring_existing_sqlite \
- test_namestore_api_zone_to_name_sqlite \
- perf_namestore_api_zone_iteration_sqlite \
- perf_namestore_api_import_sqlite \
- perf_namestore_api_import_postgres \
- test_namestore_api_tx_rollback_sqlite
-endif
-
-
-if HAVE_POSTGRESQL
-POSTGRES_PLUGIN = libgnunet_plugin_namestore_postgres.la
-POSTGRES_TESTS = test_plugin_namestore_postgres \
- test_namestore_api_store_postgres \
- test_namestore_api_store_update_postgres \
- test_namestore_api_remove_postgres \
- test_namestore_api_zone_iteration_postgres \
- test_namestore_api_lookup_nick_postgres \
- test_namestore_api_monitoring_postgres \
- test_namestore_api_remove_not_existing_record_postgres \
- test_namestore_api_zone_iteration_nick_postgres \
- test_namestore_api_zone_iteration_specific_zone_postgres \
- test_namestore_api_zone_iteration_stop_postgres \
- test_namestore_api_monitoring_existing_postgres \
- test_namestore_api_zone_to_name_postgres \
- perf_namestore_api_zone_iteration_postgres \
- test_namestore_api_tx_rollback_postgres
-if HAVE_EXPERIMENTAL
-POSTGRES_TESTS += test_namestore_api_edit_records_postgres
-endif
-endif
-
-if HAVE_SQLITE
-check_PROGRAMS = \
- $(SQLITE_TESTS) \
- $(POSTGRES_TESTS)
-endif
-if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export
PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset
XDG_CONFIG_HOME;
-TESTS = \
- $(check_PROGRAMS) \
- $(check_SCRIPTS)
-endif
plugin_LTLIBRARIES = \
$(SQLITE_PLUGIN) \
@@ -101,311 +46,34 @@ libgnunet_plugin_namestore_postgres_la_LIBADD = \
libgnunet_plugin_namestore_postgres_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS) $(POSTGRESQL_LDFLAGS)
-test_namestore_api_store_sqlite_SOURCES = \
- test_namestore_api_store.c
-test_namestore_api_store_sqlite_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_store_postgres_SOURCES = \
- test_namestore_api_store.c
-test_namestore_api_store_postgres_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_store_update_sqlite_SOURCES = \
- test_namestore_api_store_update.c
-test_namestore_api_store_update_sqlite_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_store_update_postgres_SOURCES = \
- test_namestore_api_store_update.c
-test_namestore_api_store_update_postgres_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_lookup_nick_sqlite_SOURCES = \
- test_namestore_api_lookup_nick.c
-test_namestore_api_lookup_nick_sqlite_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_lookup_nick_postgres_SOURCES = \
- test_namestore_api_lookup_nick.c
-test_namestore_api_lookup_nick_postgres_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_remove_sqlite_SOURCES = \
- test_namestore_api_remove.c
-test_namestore_api_remove_sqlite_LDADD = \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_remove_postgres_SOURCES = \
- test_namestore_api_remove.c
-test_namestore_api_remove_postgres_LDADD = \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_remove_not_existing_record_sqlite_SOURCES = \
- test_namestore_api_remove_not_existing_record.c
-test_namestore_api_remove_not_existing_record_sqlite_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_remove_not_existing_record_postgres_SOURCES = \
- test_namestore_api_remove_not_existing_record.c
-test_namestore_api_remove_not_existing_record_postgres_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_zone_to_name_sqlite_SOURCES = \
- test_namestore_api_zone_to_name.c
-test_namestore_api_zone_to_name_sqlite_LDADD = \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_zone_to_name_postgres_SOURCES = \
- test_namestore_api_zone_to_name.c
-test_namestore_api_zone_to_name_postgres_LDADD = \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_monitoring_sqlite_SOURCES = \
- test_namestore_api_monitoring.c
-test_namestore_api_monitoring_sqlite_LDADD = \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_namestore_api_monitoring_postgres_SOURCES = \
- test_namestore_api_monitoring.c
-test_namestore_api_monitoring_postgres_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_namestore_api_monitoring_existing_sqlite_SOURCES = \
- test_namestore_api_monitoring_existing.c
-test_namestore_api_monitoring_existing_sqlite_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_namestore_api_monitoring_existing_postgres_SOURCES = \
- test_namestore_api_monitoring_existing.c
-test_namestore_api_monitoring_existing_postgres_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_namestore_api_tx_rollback_sqlite_SOURCES = \
- test_namestore_api_tx_rollback.c
-test_namestore_api_tx_rollback_sqlite_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_namestore_api_tx_rollback_postgres_SOURCES = \
- test_namestore_api_tx_rollback.c
-test_namestore_api_tx_rollback_postgres_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-if HAVE_EXPERIMENTAL
-test_namestore_api_edit_records_postgres_SOURCES = \
- test_namestore_api_edit_records.c
-test_namestore_api_edit_records_postgres_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
+if HAVE_SQLITE
+SQLITE_PLUGIN = libgnunet_plugin_namestore_sqlite.la
+SQLITE_TESTS = test_plugin_namestore_sqlite
endif
-test_namestore_api_zone_iteration_sqlite_SOURCES = \
- test_namestore_api_zone_iteration.c
-test_namestore_api_zone_iteration_sqlite_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_zone_iteration_postgres_SOURCES = \
- test_namestore_api_zone_iteration.c
-test_namestore_api_zone_iteration_postgres_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-perf_namestore_api_zone_iteration_postgres_SOURCES = \
- perf_namestore_api_zone_iteration.c
-perf_namestore_api_zone_iteration_postgres_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-perf_namestore_api_import_sqlite_SOURCES = \
- perf_namestore_api_import.c
-perf_namestore_api_import_sqlite_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-perf_namestore_api_import_postgres_SOURCES = \
- perf_namestore_api_import.c
-perf_namestore_api_import_postgres_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-perf_namestore_api_zone_iteration_sqlite_SOURCES = \
- perf_namestore_api_zone_iteration.c
-perf_namestore_api_zone_iteration_sqlite_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_zone_iteration_nick_sqlite_SOURCES = \
- test_namestore_api_zone_iteration_nick.c
-test_namestore_api_zone_iteration_nick_sqlite_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_zone_iteration_nick_postgres_SOURCES = \
- test_namestore_api_zone_iteration_nick.c
-test_namestore_api_zone_iteration_nick_postgres_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_zone_iteration_specific_zone_sqlite_SOURCES = \
- test_namestore_api_zone_iteration_specific_zone.c
-test_namestore_api_zone_iteration_specific_zone_sqlite_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_zone_iteration_specific_zone_postgres_SOURCES = \
- test_namestore_api_zone_iteration_specific_zone.c
-test_namestore_api_zone_iteration_specific_zone_postgres_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_zone_iteration_stop_sqlite_SOURCES = \
- test_namestore_api_zone_iteration_stop.c
-test_namestore_api_zone_iteration_stop_sqlite_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_zone_iteration_stop_postgres_SOURCES = \
- test_namestore_api_zone_iteration_stop.c
-test_namestore_api_zone_iteration_stop_postgres_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+if HAVE_POSTGRESQL
+POSTGRES_PLUGIN = libgnunet_plugin_namestore_postgres.la
+POSTGRES_TESTS = test_plugin_namestore_postgres
+endif
+if HAVE_SQLITE
+check_PROGRAMS = \
+ $(SQLITE_TESTS) \
+ $(POSTGRES_TESTS)
+endif
test_plugin_namestore_sqlite_SOURCES = \
test_plugin_namestore.c
test_plugin_namestore_sqlite_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
test_plugin_namestore_postgres_SOURCES = \
test_plugin_namestore.c
test_plugin_namestore_postgres_LDADD = \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
EXTRA_DIST = \
- test_common.c \
- test_namestore_api.conf \
- test_namestore_api_postgres.conf \
- test_namestore_api_sqlite.conf \
- perf_namestore_api_postgres.conf \
- perf_namestore_api_sqlite.conf \
test_plugin_namestore_sqlite.conf \
test_plugin_namestore_postgres.conf \
- $(sql_DATA)
+ $(sql_DATA)
+
diff --git a/src/plugin/namestore/meson.build b/src/plugin/namestore/meson.build
index d51b4b730..4a077915d 100644
--- a/src/plugin/namestore/meson.build
+++ b/src/plugin/namestore/meson.build
@@ -10,6 +10,10 @@ shared_module('gnunet_plugin_namestore_sqlite',
install: true,
install_dir: get_option('libdir')/'gnunet')
+configure_file(copy: true,
+ input: 'test_plugin_namestore_sqlite.conf',
+ output: 'test_plugin_namestore_sqlite.conf')
+
if pq_dep.found()
shared_module('gnunet_plugin_namestore_postgres',
['plugin_namestore_postgres.c'],
@@ -20,5 +24,28 @@ if pq_dep.found()
include_directories: [incdir, configuration_inc],
install: true,
install_dir: get_option('libdir')/'gnunet')
+configure_file(copy: true,
+ input: 'test_plugin_namestore_postgres.conf',
+ output: 'test_plugin_namestore_postgres.conf')
+
+ testpluginnamestore_pq = executable ('test_plugin_namestore_postgres',
+ ['test_plugin_namestore.c'],
+ dependencies: [
+ libgnunetutil_dep
+ ],
+ include_directories: [incdir, configuration_inc],
+ install: false)
+ test('test_plugin_namestore_postgres', testpluginnamestore_pq, workdir:
meson.current_build_dir(),
+ suite: 'namestore')
endif
+testpluginnamestore_sq = executable ('test_plugin_namestore_sqlite',
+ ['test_plugin_namestore.c'],
+ dependencies: [
+ libgnunetutil_dep
+ ],
+ include_directories: [incdir, configuration_inc],
+ install: false)
+test('test_plugin_namestore_sqlite', testpluginnamestore_sq, workdir:
meson.current_build_dir(),
+ suite: 'namestore')
+
diff --git a/src/plugin/namestore/test_plugin_namestore.c
b/src/plugin/namestore/test_plugin_namestore.c
index 388b23f57..d471253ca 100644
--- a/src/plugin/namestore/test_plugin_namestore.c
+++ b/src/plugin/namestore/test_plugin_namestore.c
@@ -25,7 +25,6 @@
#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_namestore_plugin.h"
-#include "gnunet_testing_lib.h"
#define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT
diff --git a/src/service/namestore/Makefile.am
b/src/service/namestore/Makefile.am
index 7f49e680f..d8f6a5318 100644
--- a/src/service/namestore/Makefile.am
+++ b/src/service/namestore/Makefile.am
@@ -61,3 +61,350 @@ gnunet_service_namestore_LDADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la \
libgnunetnamestore.la \
$(GN_LIBINTL)
+
+if HAVE_SQLITE
+SQLITE_TESTS = \
+ test_namestore_api_store_sqlite \
+ test_namestore_api_store_update_sqlite \
+ test_namestore_api_zone_iteration_sqlite \
+ test_namestore_api_remove_sqlite \
+ test_namestore_api_lookup_nick_sqlite \
+ test_namestore_api_monitoring_sqlite \
+ test_namestore_api_remove_not_existing_record_sqlite \
+ test_namestore_api_zone_iteration_nick_sqlite \
+ test_namestore_api_zone_iteration_specific_zone_sqlite \
+ test_namestore_api_zone_iteration_stop_sqlite \
+ test_namestore_api_monitoring_existing_sqlite \
+ test_namestore_api_zone_to_name_sqlite \
+ perf_namestore_api_zone_iteration_sqlite \
+ perf_namestore_api_import_sqlite \
+ perf_namestore_api_import_postgres \
+ test_namestore_api_tx_rollback_sqlite
+endif
+
+
+if HAVE_POSTGRESQL
+POSTGRES_TESTS = \
+ test_namestore_api_store_postgres \
+ test_namestore_api_store_update_postgres \
+ test_namestore_api_remove_postgres \
+ test_namestore_api_zone_iteration_postgres \
+ test_namestore_api_lookup_nick_postgres \
+ test_namestore_api_monitoring_postgres \
+ test_namestore_api_remove_not_existing_record_postgres \
+ test_namestore_api_zone_iteration_nick_postgres \
+ test_namestore_api_zone_iteration_specific_zone_postgres \
+ test_namestore_api_zone_iteration_stop_postgres \
+ test_namestore_api_monitoring_existing_postgres \
+ test_namestore_api_zone_to_name_postgres \
+ perf_namestore_api_zone_iteration_postgres \
+ test_namestore_api_tx_rollback_postgres
+if HAVE_EXPERIMENTAL
+POSTGRES_TESTS += test_namestore_api_edit_records_postgres
+endif
+endif
+
+check_PROGRAMS = \
+ $(SQLITE_TESTS) \
+ $(POSTGRES_TESTS)
+
+if ENABLE_TEST_RUN
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export
PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset
XDG_CONFIG_HOME;
+TESTS = \
+ $(check_PROGRAMS) \
+ $(check_SCRIPTS)
+endif
+
+test_namestore_api_store_sqlite_SOURCES = \
+ test_namestore_api_store.c
+test_namestore_api_store_sqlite_LDADD = \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+test_namestore_api_store_postgres_SOURCES = \
+ test_namestore_api_store.c
+test_namestore_api_store_postgres_LDADD = \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+test_namestore_api_store_update_sqlite_SOURCES = \
+ test_namestore_api_store_update.c
+test_namestore_api_store_update_sqlite_LDADD = \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+ $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+test_namestore_api_store_update_postgres_SOURCES = \
+ test_namestore_api_store_update.c
+test_namestore_api_store_update_postgres_LDADD = \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+ $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+test_namestore_api_lookup_nick_sqlite_SOURCES = \
+ test_namestore_api_lookup_nick.c
+test_namestore_api_lookup_nick_sqlite_LDADD = \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+ $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+test_namestore_api_lookup_nick_postgres_SOURCES = \
+ test_namestore_api_lookup_nick.c
+test_namestore_api_lookup_nick_postgres_LDADD = \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+ $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+test_namestore_api_remove_sqlite_SOURCES = \
+ test_namestore_api_remove.c
+test_namestore_api_remove_sqlite_LDADD = \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+test_namestore_api_remove_postgres_SOURCES = \
+ test_namestore_api_remove.c
+test_namestore_api_remove_postgres_LDADD = \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+test_namestore_api_remove_not_existing_record_sqlite_SOURCES = \
+ test_namestore_api_remove_not_existing_record.c
+test_namestore_api_remove_not_existing_record_sqlite_LDADD = \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+test_namestore_api_remove_not_existing_record_postgres_SOURCES = \
+ test_namestore_api_remove_not_existing_record.c
+test_namestore_api_remove_not_existing_record_postgres_LDADD = \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+test_namestore_api_zone_to_name_sqlite_SOURCES = \
+ test_namestore_api_zone_to_name.c
+test_namestore_api_zone_to_name_sqlite_LDADD = \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+test_namestore_api_zone_to_name_postgres_SOURCES = \
+ test_namestore_api_zone_to_name.c
+test_namestore_api_zone_to_name_postgres_LDADD = \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+test_namestore_api_monitoring_sqlite_SOURCES = \
+ test_namestore_api_monitoring.c
+test_namestore_api_monitoring_sqlite_LDADD = \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
+ $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la
+
+test_namestore_api_monitoring_postgres_SOURCES = \
+ test_namestore_api_monitoring.c
+test_namestore_api_monitoring_postgres_LDADD = \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
+ $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la
+
+test_namestore_api_monitoring_existing_sqlite_SOURCES = \
+ test_namestore_api_monitoring_existing.c
+test_namestore_api_monitoring_existing_sqlite_LDADD = \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
+ $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la
+
+test_namestore_api_monitoring_existing_postgres_SOURCES = \
+ test_namestore_api_monitoring_existing.c
+test_namestore_api_monitoring_existing_postgres_LDADD = \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
+ $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la
+
+test_namestore_api_tx_rollback_sqlite_SOURCES = \
+ test_namestore_api_tx_rollback.c
+test_namestore_api_tx_rollback_sqlite_LDADD = \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
+ $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la
+
+test_namestore_api_tx_rollback_postgres_SOURCES = \
+ test_namestore_api_tx_rollback.c
+test_namestore_api_tx_rollback_postgres_LDADD = \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
+ $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la
+
+if HAVE_EXPERIMENTAL
+test_namestore_api_edit_records_postgres_SOURCES = \
+ test_namestore_api_edit_records.c
+test_namestore_api_edit_records_postgres_LDADD = \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
+ $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la
+endif
+
+test_namestore_api_zone_iteration_sqlite_SOURCES = \
+ test_namestore_api_zone_iteration.c
+test_namestore_api_zone_iteration_sqlite_LDADD = \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+test_namestore_api_zone_iteration_postgres_SOURCES = \
+ test_namestore_api_zone_iteration.c
+test_namestore_api_zone_iteration_postgres_LDADD = \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+perf_namestore_api_zone_iteration_postgres_SOURCES = \
+ perf_namestore_api_zone_iteration.c
+perf_namestore_api_zone_iteration_postgres_LDADD = \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+perf_namestore_api_import_sqlite_SOURCES = \
+ perf_namestore_api_import.c
+perf_namestore_api_import_sqlite_LDADD = \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+perf_namestore_api_import_postgres_SOURCES = \
+ perf_namestore_api_import.c
+perf_namestore_api_import_postgres_LDADD = \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+
+perf_namestore_api_zone_iteration_sqlite_SOURCES = \
+ perf_namestore_api_zone_iteration.c
+perf_namestore_api_zone_iteration_sqlite_LDADD = \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+test_namestore_api_zone_iteration_nick_sqlite_SOURCES = \
+ test_namestore_api_zone_iteration_nick.c
+test_namestore_api_zone_iteration_nick_sqlite_LDADD = \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+test_namestore_api_zone_iteration_nick_postgres_SOURCES = \
+ test_namestore_api_zone_iteration_nick.c
+test_namestore_api_zone_iteration_nick_postgres_LDADD = \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+test_namestore_api_zone_iteration_specific_zone_sqlite_SOURCES = \
+ test_namestore_api_zone_iteration_specific_zone.c
+test_namestore_api_zone_iteration_specific_zone_sqlite_LDADD = \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+test_namestore_api_zone_iteration_specific_zone_postgres_SOURCES = \
+ test_namestore_api_zone_iteration_specific_zone.c
+test_namestore_api_zone_iteration_specific_zone_postgres_LDADD = \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+test_namestore_api_zone_iteration_stop_sqlite_SOURCES = \
+ test_namestore_api_zone_iteration_stop.c
+test_namestore_api_zone_iteration_stop_sqlite_LDADD = \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+test_namestore_api_zone_iteration_stop_postgres_SOURCES = \
+ test_namestore_api_zone_iteration_stop.c
+test_namestore_api_zone_iteration_stop_postgres_LDADD = \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+
+EXTRA_DIST = \
+ test_common.c \
+ test_namestore_api.conf \
+ test_namestore_api_postgres.conf \
+ test_namestore_api_sqlite.conf \
+ perf_namestore_api_postgres.conf \
+ perf_namestore_api_sqlite.conf
+
diff --git a/src/service/namestore/meson.build
b/src/service/namestore/meson.build
index 912b312fa..616c8ad01 100644
--- a/src/service/namestore/meson.build
+++ b/src/service/namestore/meson.build
@@ -55,3 +55,59 @@ executable ('gnunet-namestore-fcfsd',
install: true,
install_dir: get_option('libdir')/'gnunet'/'libexec')
+
+configure_file(copy: true,
+ input: 'test_namestore_api.conf',
+ output: 'test_namestore_api.conf')
+
+configure_file(copy: true,
+ input: 'test_namestore_api_sqlite.conf',
+ output: 'test_namestore_api_sqlite.conf')
+
+namestoreapitestnames = [
+ 'test_namestore_api_edit_records',
+ 'test_namestore_api_lookup_nick',
+ 'test_namestore_api_monitoring',
+ 'test_namestore_api_monitoring_existing',
+ 'test_namestore_api_remove',
+ 'test_namestore_api_remove_not_existing_record',
+ 'test_namestore_api_store',
+ 'test_namestore_api_store_update',
+ 'test_namestore_api_tx_rollback',
+ 'test_namestore_api_zone_iteration',
+ 'test_namestore_api_zone_iteration_nick',
+ 'test_namestore_api_zone_iteration_specific_zone',
+ 'test_namestore_api_zone_iteration_stop',
+ 'test_namestore_api_zone_to_name'
+ ]
+
+foreach tn : namestoreapitestnames
+ t = executable (tn + '_sqlite',
+ [tn + '.c'],
+ dependencies: [
+ libgnunettesting_dep,
+ libgnunetutil_dep,
+ libgnunetgnsrecord_dep,
+ libgnunetidentity_dep,
+ libgnunetnamestore_dep],
+ include_directories: [incdir, configuration_inc],
+ install: false)
+ test(tn + '_sqlite', t, workdir: meson.current_build_dir(),
+ suite: 'namestore')
+ if pq_dep.found()
+ t_pq = executable (tn + '_postgres',
+ [tn + '.c'],
+ dependencies: [
+ libgnunettesting_dep,
+ libgnunetutil_dep,
+ libgnunetgnsrecord_dep,
+ libgnunetidentity_dep,
+ libgnunetnamestore_dep],
+ include_directories: [incdir, configuration_inc],
+ install: false)
+ test(tn + '_postgres', t, workdir: meson.current_build_dir(),
+ suite: 'namestore')
+ endif
+endforeach
+
+# FIXME perf tests missing
diff --git a/src/plugin/namestore/perf_namestore_api_import.c
b/src/service/namestore/perf_namestore_api_import.c
similarity index 99%
rename from src/plugin/namestore/perf_namestore_api_import.c
rename to src/service/namestore/perf_namestore_api_import.c
index e56fb961c..8ffab30ea 100644
--- a/src/plugin/namestore/perf_namestore_api_import.c
+++ b/src/service/namestore/perf_namestore_api_import.c
@@ -25,7 +25,7 @@
#include "platform.h"
#include "gnunet_namestore_service.h"
#include "gnunet_testing_lib.h"
-#include "namestore.h"
+#include "../service/namestore/namestore.h"
#define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT
diff --git a/src/plugin/namestore/perf_namestore_api_postgres.conf
b/src/service/namestore/perf_namestore_api_postgres.conf
similarity index 100%
rename from src/plugin/namestore/perf_namestore_api_postgres.conf
rename to src/service/namestore/perf_namestore_api_postgres.conf
diff --git a/src/plugin/namestore/perf_namestore_api_sqlite.conf
b/src/service/namestore/perf_namestore_api_sqlite.conf
similarity index 100%
rename from src/plugin/namestore/perf_namestore_api_sqlite.conf
rename to src/service/namestore/perf_namestore_api_sqlite.conf
diff --git a/src/plugin/namestore/perf_namestore_api_zone_iteration.c
b/src/service/namestore/perf_namestore_api_zone_iteration.c
similarity index 99%
rename from src/plugin/namestore/perf_namestore_api_zone_iteration.c
rename to src/service/namestore/perf_namestore_api_zone_iteration.c
index e16748f5b..f96839e65 100644
--- a/src/plugin/namestore/perf_namestore_api_zone_iteration.c
+++ b/src/service/namestore/perf_namestore_api_zone_iteration.c
@@ -25,7 +25,7 @@
#include "platform.h"
#include "gnunet_namestore_service.h"
#include "gnunet_testing_lib.h"
-#include "namestore.h"
+#include "../service/namestore/namestore.h"
#define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT
diff --git a/src/plugin/namestore/test_common.c
b/src/service/namestore/test_common.c
similarity index 100%
rename from src/plugin/namestore/test_common.c
rename to src/service/namestore/test_common.c
diff --git a/src/plugin/namestore/test_namestore_api.conf
b/src/service/namestore/test_namestore_api.conf
similarity index 83%
rename from src/plugin/namestore/test_namestore_api.conf
rename to src/service/namestore/test_namestore_api.conf
index 1648c7cae..647cd8e20 100644
--- a/src/plugin/namestore/test_namestore_api.conf
+++ b/src/service/namestore/test_namestore_api.conf
@@ -1,5 +1,5 @@
-@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf
-@INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf
+@INLINE@ ../../../contrib/conf/gnunet/no_forcestart.conf
+@INLINE@ ../../../contrib/conf/gnunet/no_autostart_above_core.conf
[PATHS]
GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-namestore/
diff --git a/src/plugin/namestore/test_namestore_api_edit_records.c
b/src/service/namestore/test_namestore_api_edit_records.c
similarity index 100%
rename from src/plugin/namestore/test_namestore_api_edit_records.c
rename to src/service/namestore/test_namestore_api_edit_records.c
diff --git a/src/plugin/namestore/test_namestore_api_lookup_nick.c
b/src/service/namestore/test_namestore_api_lookup_nick.c
similarity index 100%
rename from src/plugin/namestore/test_namestore_api_lookup_nick.c
rename to src/service/namestore/test_namestore_api_lookup_nick.c
diff --git a/src/plugin/namestore/test_namestore_api_monitoring.c
b/src/service/namestore/test_namestore_api_monitoring.c
similarity index 99%
rename from src/plugin/namestore/test_namestore_api_monitoring.c
rename to src/service/namestore/test_namestore_api_monitoring.c
index 74dad3749..0bcdf40c5 100644
--- a/src/plugin/namestore/test_namestore_api_monitoring.c
+++ b/src/service/namestore/test_namestore_api_monitoring.c
@@ -24,7 +24,7 @@
#include "platform.h"
#include "gnunet_namestore_service.h"
#include "gnunet_testing_lib.h"
-#include "namestore.h"
+#include "../service/namestore/namestore.h"
#define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT
diff --git a/src/plugin/namestore/test_namestore_api_monitoring_existing.c
b/src/service/namestore/test_namestore_api_monitoring_existing.c
similarity index 99%
rename from src/plugin/namestore/test_namestore_api_monitoring_existing.c
rename to src/service/namestore/test_namestore_api_monitoring_existing.c
index fe17833c8..553bbf7d1 100644
--- a/src/plugin/namestore/test_namestore_api_monitoring_existing.c
+++ b/src/service/namestore/test_namestore_api_monitoring_existing.c
@@ -24,7 +24,7 @@
#include "platform.h"
#include "gnunet_namestore_service.h"
#include "gnunet_testing_lib.h"
-#include "namestore.h"
+#include "../service/namestore/namestore.h"
#define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT
diff --git a/src/plugin/namestore/test_namestore_api_postgres.conf
b/src/service/namestore/test_namestore_api_postgres.conf
similarity index 100%
rename from src/plugin/namestore/test_namestore_api_postgres.conf
rename to src/service/namestore/test_namestore_api_postgres.conf
diff --git a/src/plugin/namestore/test_namestore_api_remove.c
b/src/service/namestore/test_namestore_api_remove.c
similarity index 100%
rename from src/plugin/namestore/test_namestore_api_remove.c
rename to src/service/namestore/test_namestore_api_remove.c
diff --git
a/src/plugin/namestore/test_namestore_api_remove_not_existing_record.c
b/src/service/namestore/test_namestore_api_remove_not_existing_record.c
similarity index 100%
rename from src/plugin/namestore/test_namestore_api_remove_not_existing_record.c
rename to src/service/namestore/test_namestore_api_remove_not_existing_record.c
diff --git a/src/plugin/namestore/test_namestore_api_sqlite.conf
b/src/service/namestore/test_namestore_api_sqlite.conf
similarity index 100%
rename from src/plugin/namestore/test_namestore_api_sqlite.conf
rename to src/service/namestore/test_namestore_api_sqlite.conf
diff --git a/src/plugin/namestore/test_namestore_api_store.c
b/src/service/namestore/test_namestore_api_store.c
similarity index 100%
rename from src/plugin/namestore/test_namestore_api_store.c
rename to src/service/namestore/test_namestore_api_store.c
diff --git a/src/plugin/namestore/test_namestore_api_store_update.c
b/src/service/namestore/test_namestore_api_store_update.c
similarity index 100%
rename from src/plugin/namestore/test_namestore_api_store_update.c
rename to src/service/namestore/test_namestore_api_store_update.c
diff --git a/src/plugin/namestore/test_namestore_api_tx_rollback.c
b/src/service/namestore/test_namestore_api_tx_rollback.c
similarity index 100%
rename from src/plugin/namestore/test_namestore_api_tx_rollback.c
rename to src/service/namestore/test_namestore_api_tx_rollback.c
diff --git a/src/plugin/namestore/test_namestore_api_zone_iteration.c
b/src/service/namestore/test_namestore_api_zone_iteration.c
similarity index 99%
rename from src/plugin/namestore/test_namestore_api_zone_iteration.c
rename to src/service/namestore/test_namestore_api_zone_iteration.c
index fb69fffcc..41854f21b 100644
--- a/src/plugin/namestore/test_namestore_api_zone_iteration.c
+++ b/src/service/namestore/test_namestore_api_zone_iteration.c
@@ -24,7 +24,7 @@
#include "platform.h"
#include "gnunet_namestore_service.h"
#include "gnunet_testing_lib.h"
-#include "namestore.h"
+#include "../service/namestore/namestore.h"
#define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT
diff --git a/src/plugin/namestore/test_namestore_api_zone_iteration_nick.c
b/src/service/namestore/test_namestore_api_zone_iteration_nick.c
similarity index 99%
rename from src/plugin/namestore/test_namestore_api_zone_iteration_nick.c
rename to src/service/namestore/test_namestore_api_zone_iteration_nick.c
index c494051d0..acd97bd6e 100644
--- a/src/plugin/namestore/test_namestore_api_zone_iteration_nick.c
+++ b/src/service/namestore/test_namestore_api_zone_iteration_nick.c
@@ -25,7 +25,7 @@
#include "gnunet_namestore_service.h"
#include "gnunet_gns_service.h"
#include "gnunet_testing_lib.h"
-#include "namestore.h"
+#include "../service/namestore/namestore.h"
#define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT
diff --git
a/src/plugin/namestore/test_namestore_api_zone_iteration_specific_zone.c
b/src/service/namestore/test_namestore_api_zone_iteration_specific_zone.c
similarity index 99%
rename from
src/plugin/namestore/test_namestore_api_zone_iteration_specific_zone.c
rename to
src/service/namestore/test_namestore_api_zone_iteration_specific_zone.c
index 02587706c..2f7fc909b 100644
--- a/src/plugin/namestore/test_namestore_api_zone_iteration_specific_zone.c
+++ b/src/service/namestore/test_namestore_api_zone_iteration_specific_zone.c
@@ -25,7 +25,7 @@
#include "platform.h"
#include "gnunet_namestore_service.h"
#include "gnunet_testing_lib.h"
-#include "namestore.h"
+#include "../service/namestore/namestore.h"
#define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT
diff --git a/src/plugin/namestore/test_namestore_api_zone_iteration_stop.c
b/src/service/namestore/test_namestore_api_zone_iteration_stop.c
similarity index 99%
rename from src/plugin/namestore/test_namestore_api_zone_iteration_stop.c
rename to src/service/namestore/test_namestore_api_zone_iteration_stop.c
index b6b0787ef..0497616de 100644
--- a/src/plugin/namestore/test_namestore_api_zone_iteration_stop.c
+++ b/src/service/namestore/test_namestore_api_zone_iteration_stop.c
@@ -24,7 +24,7 @@
#include "platform.h"
#include "gnunet_namestore_service.h"
#include "gnunet_testing_lib.h"
-#include "namestore.h"
+#include "../service/namestore/namestore.h"
#define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT
diff --git a/src/plugin/namestore/test_namestore_api_zone_to_name.c
b/src/service/namestore/test_namestore_api_zone_to_name.c
similarity index 99%
rename from src/plugin/namestore/test_namestore_api_zone_to_name.c
rename to src/service/namestore/test_namestore_api_zone_to_name.c
index c70eef53a..83188d230 100644
--- a/src/plugin/namestore/test_namestore_api_zone_to_name.c
+++ b/src/service/namestore/test_namestore_api_zone_to_name.c
@@ -24,7 +24,7 @@
#include "platform.h"
#include "gnunet_namestore_service.h"
#include "gnunet_testing_lib.h"
-#include "namestore.h"
+#include "../service/namestore/namestore.h"
#define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT
diff --git a/src/service/util/meson.build b/src/service/util/meson.build
index a7199fa4b..b7642c905 100644
--- a/src/service/util/meson.build
+++ b/src/service/util/meson.build
@@ -19,3 +19,16 @@ executable ('gnunet-service-resolver',
include_directories: [incdir, configuration_inc],
install: true,
install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+
+testresolverapi = executable ('test_resolver_api',
+ ['test_resolver_api.c'],
+ dependencies: [libgnunetutil_dep],
+ include_directories: [incdir, configuration_inc],
+ install: false)
+configure_file(copy: true,
+ input: 'test_resolver_api_data.conf',
+ output: 'test_resolver_api_data.conf')
+
+test('test_resolver_api', testresolverapi, workdir: meson.current_build_dir(),
+ suite: 'resolver')
+
diff --git a/src/service/util/test_resolver_api.c
b/src/service/util/test_resolver_api.c
index 5ad0c6bf3..f8a2164a2 100644
--- a/src/service/util/test_resolver_api.c
+++ b/src/service/util/test_resolver_api.c
@@ -25,7 +25,7 @@
#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_resolver_service.h"
-#include "resolver.h"
+#include "../lib/util/resolver.h"
static int disable_rootserver_check;
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnunet] branch master updated: meson/tests: Test order and fixes for namestore et al.,
gnunet <=