[GNUnet-SVN] [gnunet] branch master updated (3223fc051 -> 76bbbdaec)

[gnunet]

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

grothoff pushed a change to branch master
in repository gnunet.

    from 3223fc051 disable valgrind
     new 6539ae1a3 add to ignore
     new 76bbbdaec bump consensus and secretsharing to be built by default

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                  | 9 +++------
 src/ats-tests/Makefile.am        | 2 +-
 src/consensus/.gitignore         | 1 +
 src/consensus/Makefile.am        | 2 ++
 src/integration-tests/.gitignore | 8 ++++++++
 src/secretsharing/.gitignore     | 1 +
 src/secretsharing/Makefile.am    | 3 ++-
 7 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 56f301ac0..21d4ee818 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,18 +6,13 @@
 if HAVE_TESTING
  TESTING = testing
  TESTBED = testbed-logger testbed
- CONSENSUS = consensus
- SECRETSHARING = secretsharing
  ATS_TESTS = ats-tests
 endif
 
 if HAVE_EXPERIMENTAL
  EXP_DIR = \
   dv \
-  rps \
-  $(CONSENSUS) \
-  $(SECRETSHARING)
-
+  rps
 endif
 
 if HAVE_JSON
@@ -111,6 +106,7 @@ SUBDIRS = \
   peerstore \
   cadet \
   set \
+  consensus \
   scalarproduct \
   revocation \
   vpn \
@@ -120,6 +116,7 @@ SUBDIRS = \
   fs \
   exit \
   pt \
+  secretsharing \
   integration-tests \
   multicast \
   psycutil \
diff --git a/src/ats-tests/Makefile.am b/src/ats-tests/Makefile.am
index 206f964cc..cfed92f2b 100644
--- a/src/ats-tests/Makefile.am
+++ b/src/ats-tests/Makefile.am
@@ -140,7 +140,7 @@ perf_ats_proportional_transport_bandwidth_LDADD = \
 perf_ats_proportional_transport_bandwidth_DEPENDENCIES = \
  libgnunetatstesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
- 
+
 perf_ats_proportional_core_latency_SOURCES = \
   perf_ats.c
 perf_ats_proportional_core_latency_LDADD = \
diff --git a/src/consensus/.gitignore b/src/consensus/.gitignore
index cc81511f9..d49147d17 100644
--- a/src/consensus/.gitignore
+++ b/src/consensus/.gitignore
@@ -2,3 +2,4 @@ gnunet-service-evil-consensus
 gnunet-consensus-profiler
 gnunet-service-consensus
 test_consensus_api
+resource.log.master
diff --git a/src/consensus/Makefile.am b/src/consensus/Makefile.am
index c04d4c207..b6385ac71 100644
--- a/src/consensus/Makefile.am
+++ b/src/consensus/Makefile.am
@@ -67,6 +67,7 @@ libgnunetconsensus_la_LIBADD = \
 libgnunetconsensus_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)
 
+if HAVE_TESTING
 check_PROGRAMS = \
  test_consensus_api
 
@@ -74,6 +75,7 @@ if ENABLE_TEST_RUN
 AM_TESTS_ENVIRONMENT=export 
GNUNET_PREFIX=$${GNUNET_PREFIX:address@hidden@};export 
PATH=$${GNUNET_PREFIX:address@hidden@}/bin:$$PATH;unset XDG_DATA_HOME;unset 
XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS)
 endif
+endif
 
 test_consensus_api_SOURCES = \
  test_consensus_api.c
diff --git a/src/integration-tests/.gitignore b/src/integration-tests/.gitignore
index c4d1568f0..46915b2a4 100644
--- a/src/integration-tests/.gitignore
+++ b/src/integration-tests/.gitignore
@@ -1,2 +1,10 @@
 gnunet_testing.py
 gnunet_pyexpect.py
+gnunet_pyexpect.pyc
+gnunet_testing.pyc
+test_integration_bootstrap_and_connect.py
+test_integration_clique.py
+test_integration_disconnect_nat.py
+test_integration_disconnect.py
+test_integration_reconnect_nat.py
+test_integration_reconnect.py
diff --git a/src/secretsharing/.gitignore b/src/secretsharing/.gitignore
index bb169f0c4..fe9db53a4 100644
--- a/src/secretsharing/.gitignore
+++ b/src/secretsharing/.gitignore
@@ -1,2 +1,3 @@
 gnunet-service-secretsharing
 gnunet-secretsharing-profiler
+test_secretsharing_api
diff --git a/src/secretsharing/Makefile.am b/src/secretsharing/Makefile.am
index 562688dd9..485183e36 100644
--- a/src/secretsharing/Makefile.am
+++ b/src/secretsharing/Makefile.am
@@ -56,6 +56,7 @@ libgnunetsecretsharing_la_LIBADD = \
 libgnunetsecretsharing_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)
 
+if HAVE_TESTING
 check_PROGRAMS = \
  test_secretsharing_api
 
@@ -63,6 +64,7 @@ if ENABLE_TEST_RUN
 AM_TESTS_ENVIRONMENT=export 
GNUNET_PREFIX=$${GNUNET_PREFIX:address@hidden@};export 
PATH=$${GNUNET_PREFIX:address@hidden@}/bin:$$PATH;unset XDG_DATA_HOME;unset 
XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS)
 endif
+endif
 
 test_secretsharing_api_SOURCES = \
  test_secretsharing_api.c
@@ -73,4 +75,3 @@ test_secretsharing_api_LDADD = \
 
 EXTRA_DIST = \
   test_secretsharing.conf
-

-- 
To stop receiving notification emails like this one, please contact
address@hidden