[gnunet] branch master updated (c2464e9f9 -> cb15c8d95)

[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 c2464e9f9 CORE: Fix tests; skip interactive script
     new d28f3bcc0 TOPOLOGY: Disable test requiring removed testbed
     new cb15c8d95 TESTS: Fix various tests

The 2 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/plugin/peerstore/test_plugin_peerstore.c | 2 ++
 src/service/fs/Makefile.am                   | 2 +-
 src/service/regex/test_regex_iterate_api.c   | 2 +-
 src/service/topology/Makefile.am             | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/plugin/peerstore/test_plugin_peerstore.c 
b/src/plugin/peerstore/test_plugin_peerstore.c
index bce62dda9..1377845aa 100644
--- a/src/plugin/peerstore/test_plugin_peerstore.c
+++ b/src/plugin/peerstore/test_plugin_peerstore.c
@@ -96,6 +96,7 @@ load_plugin (const struct GNUNET_CONFIGURATION_Handle *cfg)
 
 static void
 test_record (void *cls,
+             uint64_t seq,
              const struct GNUNET_PEERSTORE_Record *record,
              const char *error)
 {
@@ -130,6 +131,7 @@ get_record (struct GNUNET_PEERSTORE_PluginFunctions *psp,
                                        "subsys",
                                        identity,
                                        "key",
+                                       0, 1,
                                        &test_record,
                                        (void *) identity));
 }
diff --git a/src/service/fs/Makefile.am b/src/service/fs/Makefile.am
index c1d545af1..0a10f688a 100644
--- a/src/service/fs/Makefile.am
+++ b/src/service/fs/Makefile.am
@@ -122,8 +122,8 @@ check_PROGRAMS = \
  test_fs_unindex_persistence \
  test_fs_uri \
  test_fs_meta_data \
- test_gnunet_service_fs_migration \
  $(FS_BENCHMARKS)
+# test_gnunet_service_fs_migration
 
 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;
diff --git a/src/service/regex/test_regex_iterate_api.c 
b/src/service/regex/test_regex_iterate_api.c
index 4fb4f7817..6355e8218 100644
--- a/src/service/regex/test_regex_iterate_api.c
+++ b/src/service/regex/test_regex_iterate_api.c
@@ -26,7 +26,7 @@
 #include <regex.h>
 #include <time.h>
 #include "regex_internal_lib.h"
-#include "regex_block_lib.h"
+#include "../../plugin/regex/regex_block_lib.h"
 #include "regex_internal.h"
 
 /**
diff --git a/src/service/topology/Makefile.am b/src/service/topology/Makefile.am
index 7f5ad1893..559e55174 100644
--- a/src/service/topology/Makefile.am
+++ b/src/service/topology/Makefile.am
@@ -28,8 +28,8 @@ gnunet_daemon_topology_LDADD = \
   $(GN_LIBINTL)
 
 
-check_PROGRAMS = \
- test_gnunet_daemon_topology
+#check_PROGRAMS = \
+# test_gnunet_daemon_topology
 
 # 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;

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