aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-12-05 15:55:15 +0000
committerChristian Grothoff <christian@grothoff.org>2013-12-05 15:55:15 +0000
commit78c3084c43eed918329cbf11aeb87b618bf5cdf6 (patch)
tree762963651e76359695822d27cf91e954e92ca4f9
parenta056cafb1f65d75de49e3832fe172695736315ae (diff)
downloadgnunet-78c3084c43eed918329cbf11aeb87b618bf5cdf6.tar.gz
gnunet-78c3084c43eed918329cbf11aeb87b618bf5cdf6.zip
-fix #3153
-rw-r--r--contrib/Makefile.am3
-rw-r--r--po/POTFILES.in13
-rw-r--r--src/integration-tests/Makefile.am34
3 files changed, 31 insertions, 19 deletions
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 7d1bfb8ab..e3ff5068e 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -61,6 +61,9 @@ EXTRA_DIST = \
61 openvpn-tap32/tap32-signed-i386-2.1.zip \ 61 openvpn-tap32/tap32-signed-i386-2.1.zip \
62 openvpn-tap32/tap32-source-2.1.zip 62 openvpn-tap32/tap32-source-2.1.zip
63 63
64CLEANFILES = \
65 $(noinst_SCRIPTS)
66
64do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g' 67do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
65 68
66%.py: %.py.in Makefile 69%.py: %.py.in Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6aec4505d..21df6fcc0 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,5 @@
1src/arm/arm_api.c 1src/arm/arm_api.c
2src/arm/arm_monitor_api.c 2src/arm/arm_monitor_api.c
3src/arm/do_start_process.c
4src/arm/gnunet-arm.c 3src/arm/gnunet-arm.c
5src/arm/gnunet-service-arm.c 4src/arm/gnunet-service-arm.c
6src/arm/mockup-service.c 5src/arm/mockup-service.c
@@ -23,6 +22,7 @@ src/consensus/consensus_api.c
23src/consensus/gnunet-consensus-profiler.c 22src/consensus/gnunet-consensus-profiler.c
24src/consensus/gnunet-service-consensus.c 23src/consensus/gnunet-service-consensus.c
25src/conversation/conversation_api.c 24src/conversation/conversation_api.c
25src/conversation/conversation_api_call.c
26src/conversation/gnunet-conversation.c 26src/conversation/gnunet-conversation.c
27src/conversation/gnunet-conversation-test.c 27src/conversation/gnunet-conversation-test.c
28src/conversation/gnunet-helper-audio-playback.c 28src/conversation/gnunet-helper-audio-playback.c
@@ -65,6 +65,13 @@ src/dht/gnunet-service-dht_hello.c
65src/dht/gnunet-service-dht_neighbours.c 65src/dht/gnunet-service-dht_neighbours.c
66src/dht/gnunet-service-dht_nse.c 66src/dht/gnunet-service-dht_nse.c
67src/dht/gnunet-service-dht_routing.c 67src/dht/gnunet-service-dht_routing.c
68src/dht/gnunet-service-xdht.c
69src/dht/gnunet-service-xdht_clients.c
70src/dht/gnunet-service-xdht_datacache.c
71src/dht/gnunet-service-xdht_hello.c
72src/dht/gnunet-service-xdht_neighbours.c
73src/dht/gnunet-service-xdht_nse.c
74src/dht/gnunet-service-xdht_routing.c
68src/dht/plugin_block_dht.c 75src/dht/plugin_block_dht.c
69src/dns/dns_api.c 76src/dns/dns_api.c
70src/dns/dnsparser.c 77src/dns/dnsparser.c
@@ -130,6 +137,7 @@ src/fs/gnunet-service-fs_put.c
130src/fs/gnunet-unindex.c 137src/fs/gnunet-unindex.c
131src/fs/plugin_block_fs.c 138src/fs/plugin_block_fs.c
132src/gns/gns_api.c 139src/gns/gns_api.c
140src/gns/gnunet-bcd.c
133src/gns/gnunet-dns2gns.c 141src/gns/gnunet-dns2gns.c
134src/gns/gnunet-gns.c 142src/gns/gnunet-gns.c
135src/gns/gnunet-gns-helper-service-w32.c 143src/gns/gnunet-gns-helper-service-w32.c
@@ -167,12 +175,10 @@ src/mesh/gnunet-service-mesh.c
167src/mesh/gnunet-service-mesh_channel.c 175src/mesh/gnunet-service-mesh_channel.c
168src/mesh/gnunet-service-mesh_connection.c 176src/mesh/gnunet-service-mesh_connection.c
169src/mesh/gnunet-service-mesh_dht.c 177src/mesh/gnunet-service-mesh_dht.c
170src/mesh/gnunet-service-mesh-enc.c
171src/mesh/gnunet-service-mesh_local.c 178src/mesh/gnunet-service-mesh_local.c
172src/mesh/gnunet-service-mesh_peer.c 179src/mesh/gnunet-service-mesh_peer.c
173src/mesh/gnunet-service-mesh_tunnel.c 180src/mesh/gnunet-service-mesh_tunnel.c
174src/mesh/mesh_api.c 181src/mesh/mesh_api.c
175src/mesh/mesh_api_enc.c
176src/mesh/mesh_common.c 182src/mesh/mesh_common.c
177src/mesh/mesh_path.c 183src/mesh/mesh_path.c
178src/mesh/mesh_test_lib.c 184src/mesh/mesh_test_lib.c
@@ -382,7 +388,6 @@ src/include/gnunet_common.h
382src/include/gnunet_mq_lib.h 388src/include/gnunet_mq_lib.h
383src/include/gnunet_postgres_lib.h 389src/include/gnunet_postgres_lib.h
384src/include/gnunet_time_lib.h 390src/include/gnunet_time_lib.h
385src/mesh/mesh_protocol_enc.h
386src/mesh/mesh_protocol.h 391src/mesh/mesh_protocol.h
387src/scalarproduct/scalarproduct.h 392src/scalarproduct/scalarproduct.h
388src/testbed/testbed_api.h 393src/testbed/testbed_api.h
diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am
index e28e54469..8535a1b2e 100644
--- a/src/integration-tests/Makefile.am
+++ b/src/integration-tests/Makefile.am
@@ -1,7 +1,7 @@
1AM_CPPFLAGS = -I$(top_srcdir)/src/include 1AM_CPPFLAGS = -I$(top_srcdir)/src/include
2 2
3if MINGW 3if MINGW
4 WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 4 WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
5endif 5endif
6 6
7if USE_COVERAGE 7if USE_COVERAGE
@@ -31,17 +31,17 @@ check_SCRIPTS = \
31 test_integration_clique_nat.py \ 31 test_integration_clique_nat.py \
32 test_integration_connect_on_restart.py 32 test_integration_connect_on_restart.py
33endif 33endif
34# test_integration_disconnect.py 34# test_integration_disconnect.py
35 35
36if HAVE_MHD 36if HAVE_MHD
37if ENABLE_TEST_RUN 37if ENABLE_TEST_RUN
38TESTS = \ 38TESTS = \
39 $(check_SCRIPTS) 39 $(check_SCRIPTS)
40endif 40endif
41endif 41endif
42 42
43connection_watchdog_SOURCE = \ 43connection_watchdog_SOURCE = \
44 connection_watchdog.c 44 connection_watchdog.c
45connection_watchdog_LDADD = \ 45connection_watchdog_LDADD = \
46 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 46 $(top_builddir)/src/statistics/libgnunetstatistics.la \
47 $(top_builddir)/src/core/libgnunetcore.la \ 47 $(top_builddir)/src/core/libgnunetcore.la \
@@ -56,11 +56,11 @@ do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
56 56
57gnunet_testing.py: gnunet_testing.py.in Makefile 57gnunet_testing.py: gnunet_testing.py.in Makefile
58 $(do_subst) < $(srcdir)/gnunet_testing.py.in > gnunet_testing.py 58 $(do_subst) < $(srcdir)/gnunet_testing.py.in > gnunet_testing.py
59 chmod +x gnunet_testing.py 59 chmod +x gnunet_testing.py
60 60
61gnunet_pyexpect.py: gnunet_pyexpect.py.in Makefile 61gnunet_pyexpect.py: gnunet_pyexpect.py.in Makefile
62 $(do_subst) < $(srcdir)/gnunet_pyexpect.py.in > gnunet_pyexpect.py 62 $(do_subst) < $(srcdir)/gnunet_pyexpect.py.in > gnunet_pyexpect.py
63 chmod +x gnunet_pyexpect.py 63 chmod +x gnunet_pyexpect.py
64 64
65test_integration_bootstrap_and_connect.py: test_integration_bootstrap_and_connect.py.in Makefile 65test_integration_bootstrap_and_connect.py: test_integration_bootstrap_and_connect.py.in Makefile
66 $(do_subst) < $(srcdir)/test_integration_bootstrap_and_connect.py.in > test_integration_bootstrap_and_connect.py 66 $(do_subst) < $(srcdir)/test_integration_bootstrap_and_connect.py.in > test_integration_bootstrap_and_connect.py
@@ -85,31 +85,31 @@ test_integration_disconnect.py: test_integration_disconnect.py.in Makefile
85 85
86test_integration_restart.py: test_integration_restart.py.in Makefile 86test_integration_restart.py: test_integration_restart.py.in Makefile
87 $(do_subst) < $(srcdir)/test_integration_restart.py.in > test_integration_restart.py 87 $(do_subst) < $(srcdir)/test_integration_restart.py.in > test_integration_restart.py
88 chmod +x test_integration_restart.py 88 chmod +x test_integration_restart.py
89 89
90test_integration_clique.py: test_integration_clique.py.in Makefile 90test_integration_clique.py: test_integration_clique.py.in Makefile
91 $(do_subst) < $(srcdir)/test_integration_clique.py.in > test_integration_clique.py 91 $(do_subst) < $(srcdir)/test_integration_clique.py.in > test_integration_clique.py
92 chmod +x test_integration_clique.py 92 chmod +x test_integration_clique.py
93 93
94test_integration_clique_nat.py: test_integration_clique_nat.py.in Makefile 94test_integration_clique_nat.py: test_integration_clique_nat.py.in Makefile
95 $(do_subst) < $(srcdir)/test_integration_clique_nat.py.in > test_integration_clique_nat.py 95 $(do_subst) < $(srcdir)/test_integration_clique_nat.py.in > test_integration_clique_nat.py
96 chmod +x test_integration_clique_nat.py 96 chmod +x test_integration_clique_nat.py
97 97
98test_integration_connect_on_restart.py: test_integration_connect_on_restart.py.in Makefile 98test_integration_connect_on_restart.py: test_integration_connect_on_restart.py.in Makefile
99 $(do_subst) < $(srcdir)/test_integration_connect_on_restart.py.in > test_integration_connect_on_restart.py 99 $(do_subst) < $(srcdir)/test_integration_connect_on_restart.py.in > test_integration_connect_on_restart.py
100 chmod +x test_integration_connect_on_restart.py 100 chmod +x test_integration_connect_on_restart.py
101 101
102test_integration_connection_values_tcp.py: test_integration_connection_values_tcp.py.in Makefile 102test_integration_connection_values_tcp.py: test_integration_connection_values_tcp.py.in Makefile
103 $(do_subst) < $(srcdir)/test_integration_connection_values_tcp.py.in > test_integration_connection_values_tcp.py 103 $(do_subst) < $(srcdir)/test_integration_connection_values_tcp.py.in > test_integration_connection_values_tcp.py
104 chmod +x test_integration_connection_values_tcp.py 104 chmod +x test_integration_connection_values_tcp.py
105 105
106test_integration_connection_values_tcp_udp.py: test_integration_connection_values_tcp_udp.py.in Makefile 106test_integration_connection_values_tcp_udp.py: test_integration_connection_values_tcp_udp.py.in Makefile
107 $(do_subst) < $(srcdir)/test_integration_connection_values_tcp_udp.py.in > test_integration_connection_values_tcp_udp.py 107 $(do_subst) < $(srcdir)/test_integration_connection_values_tcp_udp.py.in > test_integration_connection_values_tcp_udp.py
108 chmod +x test_integration_connection_values_tcp_udp.py 108 chmod +x test_integration_connection_values_tcp_udp.py
109 109
110test_integration_connection_values_tcp_udp_http.py: test_integration_connection_values_tcp_udp_http.py.in Makefile 110test_integration_connection_values_tcp_udp_http.py: test_integration_connection_values_tcp_udp_http.py.in Makefile
111 $(do_subst) < $(srcdir)/test_integration_connection_values_tcp_udp_http.py.in > test_integration_connection_values_tcp_udp_http.py 111 $(do_subst) < $(srcdir)/test_integration_connection_values_tcp_udp_http.py.in > test_integration_connection_values_tcp_udp_http.py
112 chmod +x test_integration_connection_values_tcp_udp_http.py 112 chmod +x test_integration_connection_values_tcp_udp_http.py
113 113
114 114
115EXTRA_DIST = \ 115EXTRA_DIST = \
@@ -149,9 +149,13 @@ EXTRA_DIST = \
149 hostkeys/0006-hostkey \ 149 hostkeys/0006-hostkey \
150 hostkeys/0007-hostkey \ 150 hostkeys/0007-hostkey \
151 hostkeys/0008-hostkey \ 151 hostkeys/0008-hostkey \
152 hostkeys/0009-hostkey 152 hostkeys/0009-hostkey
153# test_integration_disconnect_nat.py 153# test_integration_disconnect_nat.py
154 154
155CLEANFILES = \ 155CLEANFILES = \
156 $(check_SCRIPTS) \ 156 $(check_SCRIPTS) \
157 gnunet_pyexpect.py \
158 test_integration_connection_values_tcp.py \
159 test_integration_connection_values_tcp_udp.py \
160 test_integration_connection_values_tcp_udp_http.py \
157 gnunet_testing.py 161 gnunet_testing.py