2 files changed, 26 insertions, 11 deletions

diff --git a/src/arm/Makefile.am b/src/arm/Makefile.am
index 8a738c5a9..6ecc7ca7a 100644
--- a/src/arm/Makefile.am
+++ b/src/arm/Makefile.am
@@ -18,7 +18,7 @@ lib_LTLIBRARIES = libgnunetarm.la
 libgnunetarm_la_SOURCES = \
   arm_api.c arm_monitor_api.c arm.h
 libgnunetarm_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(GN_LIBINTL) $(XLIB)
 libgnunetarm_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)   \
@@ -38,19 +38,19 @@ gnunet_arm_SOURCES = \
  gnunet-arm.c
 gnunet_arm_LDADD = \
   libgnunetarm.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(GN_LIBINTL)
 
 gnunet_service_arm_SOURCES = \
  gnunet-service-arm.c
 gnunet_service_arm_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(GN_LIBINTL)
 
 mockup_service_SOURCES = \
   mockup-service.c
  mockup_service_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/lib/util/libgnunetutil.la
 mockup_service_LDFLAGS = \
  $(GN_LIBINTL)
 
@@ -74,19 +74,19 @@ test_arm_api_SOURCES = \
  test_arm_api.c
 test_arm_api_LDADD = \
   libgnunetarm.la \
-  $(top_builddir)/src/util/libgnunetutil.la
+  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_exponential_backoff_SOURCES = \
  test_exponential_backoff.c
 test_exponential_backoff_LDADD = \
   libgnunetarm.la \
-  $(top_builddir)/src/util/libgnunetutil.la
+  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_gnunet_service_arm_SOURCES = \
  test_gnunet_service_arm.c
  test_gnunet_service_arm_LDADD = \
   libgnunetarm.la \
-  $(top_builddir)/src/util/libgnunetutil.la
+  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 SUFFIXES = .py.in .py
 .py.in.py:
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')