diff options
Diffstat (limited to 'src/contrib/service')
-rw-r--r-- | src/contrib/service/consensus/Makefile.am | 4 | ||||
-rw-r--r-- | src/contrib/service/consensus/meson.build | 3 | ||||
-rw-r--r-- | src/contrib/service/conversation/Makefile.am | 24 | ||||
-rw-r--r-- | src/contrib/service/conversation/meson.build | 3 |
4 files changed, 20 insertions, 14 deletions
diff --git a/src/contrib/service/consensus/Makefile.am b/src/contrib/service/consensus/Makefile.am index 6b4db05fc..35ac47203 100644 --- a/src/contrib/service/consensus/Makefile.am +++ b/src/contrib/service/consensus/Makefile.am | |||
@@ -80,8 +80,8 @@ libgnunet_plugin_block_consensus_la_LDFLAGS = \ | |||
80 | 80 | ||
81 | 81 | ||
82 | 82 | ||
83 | check_PROGRAMS = \ | 83 | #check_PROGRAMS = \ |
84 | test_consensus_api | 84 | # test_consensus_api |
85 | 85 | ||
86 | if ENABLE_TEST_RUN | 86 | if ENABLE_TEST_RUN |
87 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; | 87 | 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/contrib/service/consensus/meson.build b/src/contrib/service/consensus/meson.build index 86cc0663b..361268c85 100644 --- a/src/contrib/service/consensus/meson.build +++ b/src/contrib/service/consensus/meson.build | |||
@@ -47,6 +47,7 @@ executable ('gnunet-service-consensus', | |||
47 | install_dir: get_option('libdir') / 'gnunet' / 'libexec') | 47 | install_dir: get_option('libdir') / 'gnunet' / 'libexec') |
48 | 48 | ||
49 | # FIXME do we need evil stuff and ENABLE_MALICIOUS? | 49 | # FIXME do we need evil stuff and ENABLE_MALICIOUS? |
50 | if false | ||
50 | 51 | ||
51 | testconsensusapi = executable ('test_consensus_api', | 52 | testconsensusapi = executable ('test_consensus_api', |
52 | ['test_consensus_api.c'], | 53 | ['test_consensus_api.c'], |
@@ -64,3 +65,5 @@ configure_file(input : 'test_consensus.conf', | |||
64 | test('test_consensus_api', testconsensusapi, | 65 | test('test_consensus_api', testconsensusapi, |
65 | workdir: meson.current_build_dir(), | 66 | workdir: meson.current_build_dir(), |
66 | suite: ['consensus', 'contrib']) | 67 | suite: ['consensus', 'contrib']) |
68 | |||
69 | endif \ No newline at end of file | ||
diff --git a/src/contrib/service/conversation/Makefile.am b/src/contrib/service/conversation/Makefile.am index b573208e6..7c5960c94 100644 --- a/src/contrib/service/conversation/Makefile.am +++ b/src/contrib/service/conversation/Makefile.am | |||
@@ -22,10 +22,10 @@ bin_PROGRAMS = \ | |||
22 | libexec_PROGRAMS = \ | 22 | libexec_PROGRAMS = \ |
23 | gnunet-service-conversation | 23 | gnunet-service-conversation |
24 | 24 | ||
25 | check_PROGRAMS = \ | 25 | #check_PROGRAMS = \ |
26 | test_conversation_api \ | 26 | # test_conversation_api \ |
27 | test_conversation_api_reject \ | 27 | # test_conversation_api_reject \ |
28 | test_conversation_api_twocalls | 28 | # test_conversation_api_twocalls |
29 | 29 | ||
30 | pkgcfg_DATA = conversation.conf | 30 | pkgcfg_DATA = conversation.conf |
31 | endif | 31 | endif |
@@ -83,17 +83,17 @@ libgnunetconversation_la_LDFLAGS = \ | |||
83 | if BUILD_PULSE_HELPERS | 83 | if BUILD_PULSE_HELPERS |
84 | AUDIO_HELPER_RECD=gnunet-helper-audio-record | 84 | AUDIO_HELPER_RECD=gnunet-helper-audio-record |
85 | AUDIO_HELPER_PLAY=gnunet-helper-audio-playback | 85 | AUDIO_HELPER_PLAY=gnunet-helper-audio-playback |
86 | AUDIO_TESTS=$(check_PROGRAMS) | 86 | #AUDIO_TESTS=$(check_PROGRAMS) |
87 | else | 87 | else |
88 | if BUILD_GST_HELPERS | 88 | if BUILD_GST_HELPERS |
89 | AUDIO_HELPER_RECD=gnunet-helper-audio-record | 89 | AUDIO_HELPER_RECD=gnunet-helper-audio-record |
90 | AUDIO_HELPER_PLAY=gnunet-helper-audio-playback | 90 | AUDIO_HELPER_PLAY=gnunet-helper-audio-playback |
91 | AUDIO_TESTS=$(check_PROGRAMS) | 91 | #AUDIO_TESTS=$(check_PROGRAMS) |
92 | else | 92 | else |
93 | if BUILD_EXPERIMENTAL_HELPERS | 93 | if BUILD_EXPERIMENTAL_HELPERS |
94 | AUDIO_HELPER_RECD=gnunet-helper-audio-record | 94 | AUDIO_HELPER_RECD=gnunet-helper-audio-record |
95 | AUDIO_HELPER_PLAY=gnunet-helper-audio-playback | 95 | AUDIO_HELPER_PLAY=gnunet-helper-audio-playback |
96 | AUDIO_TESTS=$(check_PROGRAMS) | 96 | #AUDIO_TESTS=$(check_PROGRAMS) |
97 | endif | 97 | endif |
98 | endif | 98 | endif |
99 | endif | 99 | endif |
@@ -117,7 +117,7 @@ gnunet_helper_audio_record_LDADD = \ | |||
117 | -lpulse -lopus -logg \ | 117 | -lpulse -lopus -logg \ |
118 | $(INTLLIBS) | 118 | $(INTLLIBS) |
119 | #gnunet_helper_audio_record_LDFLAGS = \ | 119 | #gnunet_helper_audio_record_LDFLAGS = \ |
120 | # | 120 | # |
121 | 121 | ||
122 | gnunet_helper_audio_playback_SOURCES = \ | 122 | gnunet_helper_audio_playback_SOURCES = \ |
123 | gnunet-helper-audio-playback.c | 123 | gnunet-helper-audio-playback.c |
@@ -126,7 +126,7 @@ gnunet_helper_audio_playback_LDADD = \ | |||
126 | -lpulse -lopus -logg \ | 126 | -lpulse -lopus -logg \ |
127 | $(INTLLIBS) | 127 | $(INTLLIBS) |
128 | #gnunet_helper_audio_playback_LDFLAGS = \ | 128 | #gnunet_helper_audio_playback_LDFLAGS = \ |
129 | # | 129 | # |
130 | else | 130 | else |
131 | if BUILD_GST_HELPERS | 131 | if BUILD_GST_HELPERS |
132 | gnunet_helper_audio_record_SOURCES = \ | 132 | gnunet_helper_audio_record_SOURCES = \ |
@@ -188,7 +188,7 @@ gnunet_service_conversation_LDADD = \ | |||
188 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 188 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
189 | $(INTLLIBS) | 189 | $(INTLLIBS) |
190 | #gnunet_service_conversation_LDFLAGS = \ | 190 | #gnunet_service_conversation_LDFLAGS = \ |
191 | # | 191 | # |
192 | 192 | ||
193 | gnunet_conversation_SOURCES = \ | 193 | gnunet_conversation_SOURCES = \ |
194 | gnunet-conversation.c | 194 | gnunet-conversation.c |
@@ -203,7 +203,7 @@ gnunet_conversation_LDADD = \ | |||
203 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 203 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
204 | $(INTLLIBS) | 204 | $(INTLLIBS) |
205 | #gnunet_conversation_LDFLAGS = \ | 205 | #gnunet_conversation_LDFLAGS = \ |
206 | # | 206 | # |
207 | 207 | ||
208 | gnunet_conversation_test_SOURCES = \ | 208 | gnunet_conversation_test_SOURCES = \ |
209 | gnunet-conversation-test.c | 209 | gnunet-conversation-test.c |
@@ -213,7 +213,7 @@ gnunet_conversation_test_LDADD = \ | |||
213 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 213 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
214 | $(INTLLIBS) | 214 | $(INTLLIBS) |
215 | #gnunet_conversation_test_LDFLAGS = \ | 215 | #gnunet_conversation_test_LDFLAGS = \ |
216 | # | 216 | # |
217 | 217 | ||
218 | 218 | ||
219 | test_conversation_api_SOURCES = \ | 219 | test_conversation_api_SOURCES = \ |
diff --git a/src/contrib/service/conversation/meson.build b/src/contrib/service/conversation/meson.build index 4ecc0fc93..70e68f094 100644 --- a/src/contrib/service/conversation/meson.build +++ b/src/contrib/service/conversation/meson.build | |||
@@ -145,6 +145,8 @@ executable ('gnunet-helper-audio-playback', | |||
145 | install: true, | 145 | install: true, |
146 | install_dir: get_option('libdir') / 'gnunet' / 'libexec') | 146 | install_dir: get_option('libdir') / 'gnunet' / 'libexec') |
147 | 147 | ||
148 | if false | ||
149 | |||
148 | testconvapi = executable ('test_conversation_api', | 150 | testconvapi = executable ('test_conversation_api', |
149 | ['test_conversation_api.c'], | 151 | ['test_conversation_api.c'], |
150 | dependencies: [libgnunetconversation_dep, | 152 | dependencies: [libgnunetconversation_dep, |
@@ -201,3 +203,4 @@ test('test_conversation_api_twocalls', testconvapitwo, workdir: meson.current_bu | |||
201 | test('test_conversation_api_reject', testconvapireject, workdir: meson.current_build_dir(), | 203 | test('test_conversation_api_reject', testconvapireject, workdir: meson.current_build_dir(), |
202 | suite: ['conversation', 'contrib']) | 204 | suite: ['conversation', 'contrib']) |
203 | 205 | ||
206 | endif \ No newline at end of file | ||