diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-02-26 01:19:55 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-02-26 01:19:55 +0100 |
commit | 76bbbdaecfd349d0a9806907bd8ebd367830170d (patch) | |
tree | 15533fc386afc4dcad6052f6ed2b82787fa48a99 /src | |
parent | 6539ae1a33fdf21eccd80431cacd67e9680ba25c (diff) | |
download | gnunet-76bbbdaecfd349d0a9806907bd8ebd367830170d.tar.gz gnunet-76bbbdaecfd349d0a9806907bd8ebd367830170d.zip |
bump consensus and secretsharing to be built by default
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 9 | ||||
-rw-r--r-- | src/ats-tests/Makefile.am | 2 | ||||
-rw-r--r-- | src/consensus/Makefile.am | 2 | ||||
-rw-r--r-- | src/integration-tests/.gitignore | 8 | ||||
-rw-r--r-- | src/secretsharing/.gitignore | 1 | ||||
-rw-r--r-- | src/secretsharing/Makefile.am | 3 |
6 files changed, 17 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 @@ | |||
6 | if HAVE_TESTING | 6 | if HAVE_TESTING |
7 | TESTING = testing | 7 | TESTING = testing |
8 | TESTBED = testbed-logger testbed | 8 | TESTBED = testbed-logger testbed |
9 | CONSENSUS = consensus | ||
10 | SECRETSHARING = secretsharing | ||
11 | ATS_TESTS = ats-tests | 9 | ATS_TESTS = ats-tests |
12 | endif | 10 | endif |
13 | 11 | ||
14 | if HAVE_EXPERIMENTAL | 12 | if HAVE_EXPERIMENTAL |
15 | EXP_DIR = \ | 13 | EXP_DIR = \ |
16 | dv \ | 14 | dv \ |
17 | rps \ | 15 | rps |
18 | $(CONSENSUS) \ | ||
19 | $(SECRETSHARING) | ||
20 | |||
21 | endif | 16 | endif |
22 | 17 | ||
23 | if HAVE_JSON | 18 | if HAVE_JSON |
@@ -111,6 +106,7 @@ SUBDIRS = \ | |||
111 | peerstore \ | 106 | peerstore \ |
112 | cadet \ | 107 | cadet \ |
113 | set \ | 108 | set \ |
109 | consensus \ | ||
114 | scalarproduct \ | 110 | scalarproduct \ |
115 | revocation \ | 111 | revocation \ |
116 | vpn \ | 112 | vpn \ |
@@ -120,6 +116,7 @@ SUBDIRS = \ | |||
120 | fs \ | 116 | fs \ |
121 | exit \ | 117 | exit \ |
122 | pt \ | 118 | pt \ |
119 | secretsharing \ | ||
123 | integration-tests \ | 120 | integration-tests \ |
124 | multicast \ | 121 | multicast \ |
125 | psycutil \ | 122 | 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 = \ | |||
140 | perf_ats_proportional_transport_bandwidth_DEPENDENCIES = \ | 140 | perf_ats_proportional_transport_bandwidth_DEPENDENCIES = \ |
141 | libgnunetatstesting.la \ | 141 | libgnunetatstesting.la \ |
142 | $(top_builddir)/src/util/libgnunetutil.la | 142 | $(top_builddir)/src/util/libgnunetutil.la |
143 | 143 | ||
144 | perf_ats_proportional_core_latency_SOURCES = \ | 144 | perf_ats_proportional_core_latency_SOURCES = \ |
145 | perf_ats.c | 145 | perf_ats.c |
146 | perf_ats_proportional_core_latency_LDADD = \ | 146 | perf_ats_proportional_core_latency_LDADD = \ |
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 = \ | |||
67 | libgnunetconsensus_la_LDFLAGS = \ | 67 | libgnunetconsensus_la_LDFLAGS = \ |
68 | $(GN_LIB_LDFLAGS) | 68 | $(GN_LIB_LDFLAGS) |
69 | 69 | ||
70 | if HAVE_TESTING | ||
70 | check_PROGRAMS = \ | 71 | check_PROGRAMS = \ |
71 | test_consensus_api | 72 | test_consensus_api |
72 | 73 | ||
@@ -74,6 +75,7 @@ if ENABLE_TEST_RUN | |||
74 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; | 75 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; |
75 | TESTS = $(check_PROGRAMS) | 76 | TESTS = $(check_PROGRAMS) |
76 | endif | 77 | endif |
78 | endif | ||
77 | 79 | ||
78 | test_consensus_api_SOURCES = \ | 80 | test_consensus_api_SOURCES = \ |
79 | test_consensus_api.c | 81 | 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 @@ | |||
1 | gnunet_testing.py | 1 | gnunet_testing.py |
2 | gnunet_pyexpect.py | 2 | gnunet_pyexpect.py |
3 | gnunet_pyexpect.pyc | ||
4 | gnunet_testing.pyc | ||
5 | test_integration_bootstrap_and_connect.py | ||
6 | test_integration_clique.py | ||
7 | test_integration_disconnect_nat.py | ||
8 | test_integration_disconnect.py | ||
9 | test_integration_reconnect_nat.py | ||
10 | 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 @@ | |||
1 | gnunet-service-secretsharing | 1 | gnunet-service-secretsharing |
2 | gnunet-secretsharing-profiler | 2 | gnunet-secretsharing-profiler |
3 | 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 = \ | |||
56 | libgnunetsecretsharing_la_LDFLAGS = \ | 56 | libgnunetsecretsharing_la_LDFLAGS = \ |
57 | $(GN_LIB_LDFLAGS) | 57 | $(GN_LIB_LDFLAGS) |
58 | 58 | ||
59 | if HAVE_TESTING | ||
59 | check_PROGRAMS = \ | 60 | check_PROGRAMS = \ |
60 | test_secretsharing_api | 61 | test_secretsharing_api |
61 | 62 | ||
@@ -63,6 +64,7 @@ if ENABLE_TEST_RUN | |||
63 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; | 64 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; |
64 | TESTS = $(check_PROGRAMS) | 65 | TESTS = $(check_PROGRAMS) |
65 | endif | 66 | endif |
67 | endif | ||
66 | 68 | ||
67 | test_secretsharing_api_SOURCES = \ | 69 | test_secretsharing_api_SOURCES = \ |
68 | test_secretsharing_api.c | 70 | test_secretsharing_api.c |
@@ -73,4 +75,3 @@ test_secretsharing_api_LDADD = \ | |||
73 | 75 | ||
74 | EXTRA_DIST = \ | 76 | EXTRA_DIST = \ |
75 | test_secretsharing.conf | 77 | test_secretsharing.conf |
76 | |||