bump consensus and secretsharing to be built by default

diff --git a/src/Makefile.am b/src/Makefile.am
index 56f301ac026a4d0f1727d759d45286732ddc5b23..21d4ee8187cfdd869a33d298cbadc6348d4a7d36 100644 (file)
--- 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 206f964cccc1d4e7419eacf0b0289cb26e65e2fe..cfed92f2b7fdc300b483ce6154836167d8442a6e 100644 (file)
--- 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/Makefile.am b/src/consensus/Makefile.am
index c04d4c2079abc2511aed4e65219681dfd093ea4c..b6385ac71de28213ebb07e0f1cf9b1c3aff2d23d 100644 (file)
--- 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:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/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 c4d1568f0d2bb91ad85b3f23fea52dde85cab9da..46915b2a4f2bb9c599de0c760f00587e7cf2bbe1 100644 (file)
--- 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 bb169f0c47a44b89d546f02aa1d4a6df6a008bee..fe9db53a4acb702faf9c613a07bc895840c6f302 100644 (file)
--- 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 562688dd997a5ba764b86e051f06a2b045b2c1f1..485183e36f6c0a9f6db25aa3f582942b704145e4 100644 (file)
--- 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:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/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
-