[gnunet] branch master updated (ba84cc9cf -> 1e97f7f28)

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a change to branch master
in repository gnunet.

    from ba84cc9cf build: fix get_version location
     new 4edae62ab meson: add dht(u) tests
     new dde603754 meson: add dns test
     new 7ef0c7341 meson: add dns test2
     new 1e97f7f28 meson: add gns tests; readd gns tests to automake

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/dht/meson.build  | 15 +++++++++++++++
 src/dhtu/meson.build | 11 +++++++++++
 src/dns/meson.build  |  6 ++++++
 src/gns/Makefile.am  | 38 +++++++++++++++++++-------------------
 src/gns/meson.build  | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 99 insertions(+), 19 deletions(-)

diff --git a/src/dht/meson.build b/src/dht/meson.build
index 02c3cb8f8..ad5b183fa 100644
--- a/src/dht/meson.build
+++ b/src/dht/meson.build
@@ -89,3 +89,18 @@ executable ('gnunet-service-dht',
             install: true,
             install_dir: get_option('libdir')/'gnunet'/'libexec')
 
+configure_file(input : 'test_dht_api_data.conf',
+               output : 'test_dht_api_data.conf',
+               copy: true)
+
+testdht_api = executable ('test_dht_api',
+            ['test_dht_api.c'],
+            dependencies: [libgnunetdht_dep,
+                           libgnunetutil_dep,
+                           libgnunettesting_dep,
+                           libgnunethello_dep],
+            include_directories: [incdir, configuration_inc],
+            install: false)
+
+test('test_dht_api', testdht_api, suite: 'dht',
+     workdir: meson.current_build_dir())
diff --git a/src/dhtu/meson.build b/src/dhtu/meson.build
index b024332dd..b2525e782 100644
--- a/src/dhtu/meson.build
+++ b/src/dhtu/meson.build
@@ -48,3 +48,14 @@ shared_module('gnunet_plugin_dhtu_gnunet',
           install: true,
           install_dir: get_option('libdir')/'gnunet')
 
+testdhtu_ip = executable('test_dhtu_ip',
+           ['test_dhtu_ip.c'],
+          dependencies: [libgnunetutil_dep,
+                         libgnunettesting_dep],
+          include_directories: [incdir, configuration_inc],
+          install: false)
+
+test('test_dhtu_ip', testdhtu_ip, suite: 'dhtu',
+     workdir: meson.current_build_dir())
+
+
diff --git a/src/dns/meson.build b/src/dns/meson.build
index 32d33f3f0..e1ac0bf29 100644
--- a/src/dns/meson.build
+++ b/src/dns/meson.build
@@ -64,4 +64,10 @@ if host_machine.system() == 'linux'
               include_directories: [incdir, configuration_inc],
               install: true,
               install_dir: get_option('libdir')/'gnunet'/'libexec')
+
+  test_dns = configure_file(input : 'test_gnunet_dns.sh',
+                 output : 'test_gnunet_dns.sh',
+                 copy: true)
+
+  test('test_gnunet_gns', test_dns, suite: 'dns', workdir: 
meson.current_build_dir())
 endif
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index 8fcd3c7c0..8b2c17ef4 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -240,30 +240,30 @@ check_PROGRAMS = \
 endif
 
 check_SCRIPTS = 
-  # test_gns_lookup.sh \
-  # test_gns_config_lookup.sh \
-  # test_gns_ipv6_lookup.sh\
-  # test_gns_txt_lookup.sh\
-  # test_gns_caa_lookup.sh\
-  # test_gns_mx_lookup.sh \
-  # test_gns_gns2dns_lookup.sh \
-  # test_gns_gns2dns_zkey_lookup.sh \
-  # test_gns_gns2dns_cname_lookup.sh \
-  # test_gns_dht_lookup.sh\
-  # test_gns_delegated_lookup.sh \
-  # test_gns_at_lookup.sh\
-  # test_gns_zkey_lookup.sh\
-  # test_gns_rel_expiration.sh\
-  #test_gns_soa_lookup.sh\
-  #test_gns_revocation.sh\
-  #test_gns_redirect_lookup.sh
+   test_gns_lookup.sh \
+   test_gns_config_lookup.sh \
+   test_gns_ipv6_lookup.sh\
+   test_gns_txt_lookup.sh\
+   test_gns_caa_lookup.sh\
+   test_gns_mx_lookup.sh \
+   test_gns_gns2dns_lookup.sh \
+   test_gns_gns2dns_zkey_lookup.sh \
+   test_gns_gns2dns_cname_lookup.sh \
+   test_gns_dht_lookup.sh\
+   test_gns_delegated_lookup.sh \
+   test_gns_at_lookup.sh\
+   test_gns_zkey_lookup.sh\
+   test_gns_rel_expiration.sh\
+   test_gns_soa_lookup.sh\
+   test_gns_revocation.sh\
+   test_gns_redirect_lookup.sh
 
 if HAVE_GNUTLS_CURL
 check_SCRIPTS += \
-  #test_proxy.sh
+  test_proxy.sh
 endif
 check_SCRIPTS += \
-  #test_plugin_rest_gns.sh
+  test_plugin_rest_gns.sh
 
 EXTRA_DIST = \
   test_gns_defaults.conf \
diff --git a/src/gns/meson.build b/src/gns/meson.build
index 6e001cf8b..b82694026 100644
--- a/src/gns/meson.build
+++ b/src/gns/meson.build
@@ -160,3 +160,51 @@ executable ('gnunet-dns2gns',
 if have_nss
   subdir('nss')
 endif
+
+testgns = [
+  'test_dns2gns',
+  'test_gns_at_lookup',
+  'test_gns_caa_lookup',
+  'test_gns_config_lookup',
+  'test_gns_delegated_lookup',
+  'test_gns_dht_lookup',
+  'test_gns_gns2dns_cname_lookup',
+  'test_gns_gns2dns_lookup',
+  'test_gns_gns2dns_zkey_lookup',
+  'test_gns_ipv6_lookup',
+  'test_gns_lookup',
+  'test_gns_multiple_record_lookup',
+  'test_gns_mx_lookup',
+  'test_gns_quickupdate',
+  'test_gns_redirect_lookup',
+  'test_gns_rel_expiration',
+  'test_gns_revocation',
+  'test_gns_soa_lookup',
+  'test_gns_txt_lookup',
+  'test_gns_zkey_lookup',
+  'test_plugin_rest_gns',
+]
+
+testconfigs = [
+  'test_dns2gns.conf',
+  'test_gns_defaults.conf',
+  'test_gns_lookup.conf',
+  'test_gns_lookup_peer1.conf',
+  'test_gns_lookup_peer2.conf',
+  'test_gns_proxy.conf',
+  'test_gns_simple_lookup.conf'
+]
+
+foreach f : testconfigs
+  configure_file(input: f, output: f, copy: true)
+endforeach
+
+foreach t : testgns
+
+  test_filename = t + '.sh'
+  test_file = configure_file(input : test_filename,
+               output : test_filename,
+               copy: true)
+
+  test(t, test_file, suite: 'gns', workdir: meson.current_build_dir(), 
is_parallel: false)
+endforeach

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.