[gnunet] branch master updated (cb15c8d95 -> 095efed3c)

[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 cb15c8d95 TESTS: Fix various tests
     new 71776841f RECLAIM: Fix cli tests
     new 095efed3c CONTRIB: Only build with experimental

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/Makefile.am                                         | 7 +++++--
 src/cli/reclaim/Makefile.am                             | 2 ++
 src/{service => cli}/reclaim/test_reclaim.conf          | 0
 src/{service => cli}/reclaim/test_reclaim_defaults.conf | 0
 src/service/messenger/Makefile.am                       | 4 ++--
 src/service/reclaim/Makefile.am                         | 4 +---
 6 files changed, 10 insertions(+), 7 deletions(-)
 rename src/{service => cli}/reclaim/test_reclaim.conf (100%)
 rename src/{service => cli}/reclaim/test_reclaim_defaults.conf (100%)

diff --git a/src/Makefile.am b/src/Makefile.am
index 524b989c1..14e9964ed 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,5 +7,8 @@ SUBDIRS = \
   lib \
        plugin \
        service \
-       cli \
-       contrib
+       cli
+
+if HAVE_EXPERIMENTAL
+       SUBDIRS += contrib
+endif
diff --git a/src/cli/reclaim/Makefile.am b/src/cli/reclaim/Makefile.am
index 1a9273f6b..9803ac7ac 100644
--- a/src/cli/reclaim/Makefile.am
+++ b/src/cli/reclaim/Makefile.am
@@ -10,6 +10,8 @@ endif
 
 
 EXTRA_DIST = \
+  test_reclaim_defaults.conf \
+  test_reclaim.conf \
   $(check_SCRIPTS)
 
 pkgcfgdir= $(pkgdatadir)/config.d/
diff --git a/src/service/reclaim/test_reclaim.conf 
b/src/cli/reclaim/test_reclaim.conf
similarity index 100%
rename from src/service/reclaim/test_reclaim.conf
rename to src/cli/reclaim/test_reclaim.conf
diff --git a/src/service/reclaim/test_reclaim_defaults.conf 
b/src/cli/reclaim/test_reclaim_defaults.conf
similarity index 100%
rename from src/service/reclaim/test_reclaim_defaults.conf
rename to src/cli/reclaim/test_reclaim_defaults.conf
diff --git a/src/service/messenger/Makefile.am 
b/src/service/messenger/Makefile.am
index 6b408c4fe..b1ecc13c8 100644
--- a/src/service/messenger/Makefile.am
+++ b/src/service/messenger/Makefile.am
@@ -133,8 +133,8 @@ check_PROGRAMS = \
   test_messenger_api \
   test_messenger_anonymous
 
-check_SCRIPTS= \
-  test_messenger_start_testcase.sh
+#check_SCRIPTS= \
+#  test_messenger_start_testcase.sh
 
 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/reclaim/Makefile.am b/src/service/reclaim/Makefile.am
index 56b9e96e1..4b745cb37 100644
--- a/src/service/reclaim/Makefile.am
+++ b/src/service/reclaim/Makefile.am
@@ -10,9 +10,7 @@ endif
 
 
 EXTRA_DIST = \
-  reclaim.conf \
-  test_reclaim_defaults.conf \
-  test_reclaim.conf
+  reclaim.conf
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 

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