[gnunet] branch master updated: meson: fix arm tests

[gnunet]

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 3d9039f40 meson: fix arm tests
3d9039f40 is described below

commit 3d9039f407d2f2f8a73e7113008d965354994d70
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Sun Oct 15 09:35:13 2023 +0200

    meson: fix arm tests
---
 meson.build         |  7 ++++++-
 src/arm/meson.build | 23 +++++++++++++++++++----
 src/meson.build     |  3 ---
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/meson.build b/meson.build
index 3af63cecc..50556948f 100644
--- a/meson.build
+++ b/meson.build
@@ -369,7 +369,12 @@ endif
 if cc.has_function('explicit_bzero')
   cdata.set('HAVE_EXPLICIT_BZERO', 1)
 endif
-
+if cc.has_function('gethostbyname')
+  cdata.set('HAVE_GETHOSTBYNAME', 1)
+endif
+if cc.has_function('gethostbyname2')
+  cdata.set('HAVE_GETHOSTBYNAME2', 1)
+endif
 
 configure_file(#input: 'gnunet_private_config.h.in',
                output : 'gnunet_private_config.h',
diff --git a/src/arm/meson.build b/src/arm/meson.build
index 9943c32f9..bfeb0b31f 100644
--- a/src/arm/meson.build
+++ b/src/arm/meson.build
@@ -39,12 +39,20 @@ executable ('gnunet-arm',
             include_directories: [incdir, configuration_inc],
             install: true,
             install_dir: get_option('bindir'))
+
 executable ('gnunet-service-arm',
             gnunetservicearm_src,
             dependencies: [libgnunetarm_dep, libgnunetutil_dep],
             include_directories: [incdir, configuration_inc],
             install: true,
             install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+
+mockservice = executable ('mockup-service',
+            ['mockup-service.c'],
+            dependencies: [libgnunetarm_dep, libgnunetutil_dep],
+            include_directories: [incdir, configuration_inc],
+            install: false)
+
 testarmapi = executable ('test_arm_api',
             testarmapi_src,
             dependencies: [libgnunetarm_dep, libgnunetutil_dep],
@@ -63,9 +71,16 @@ testgnunetservice = executable ('test_gnunet_service',
 configure_file(copy: true,
                input: 'test_arm_api_data.conf',
                output: 'test_arm_api_data.conf')
-test('test_arm_api', testarmapi, workdir: meson.current_source_dir(),
+
+# FIXME: We need to convert the convoluted awk script from Makefile.am here
+#configure_file(copy: true,
+#               input: 'test_gnunet_arm.py.in',
+#               output: 'test_gnunet_arm.py')
+
+test('test_arm_api', testarmapi, workdir: meson.current_build_dir(),
      suite: 'arm')
-# FIXME this test currently times out/fails.
-#test('test_exponential_backoff', testexpbo, workdir: 
meson.current_source_dir())
-test('test_gnunet_service', testgnunetservice, workdir: 
meson.current_source_dir(),
+test('test_exponential_backoff', testexpbo, workdir: meson.current_build_dir(),
+  depends: mockservice,
+  timeout: 60, suite: 'arm')
+test('test_gnunet_service_arm', testgnunetservice, workdir: 
meson.current_build_dir(),
      suite: 'arm')
diff --git a/src/meson.build b/src/meson.build
index c59ecfab9..b52f59c89 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -16,14 +16,12 @@ subdir('curl', if_found : [curl_dep])
 if get_option('monolith') == false
   subdir('rest')
 endif
-#subdir('peerinfo')
 subdir('sq', if_found : [sqlite_dep])
 subdir('pq', if_found : [pq_dep])
 subdir('datacache')
 subdir('datastore')
 #subdir('template')
 subdir('peerstore')
-#subdir('ats')
 subdir('nat')
 subdir('nat-auto')
 subdir('transport')
@@ -50,7 +48,6 @@ subdir('gns')
 subdir('zonemaster')
 #subdir('$(CONVERSATION_DIR)')
 subdir('fs')
-# TODO
 subdir('exit')
 subdir('pt')
 subdir('secretsharing')

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