aboutsummaryrefslogtreecommitdiff
path: root/src/contrib/service
diff options
context:
space:
mode:
Diffstat (limited to 'src/contrib/service')
-rw-r--r--src/contrib/service/consensus/Makefile.am4
-rw-r--r--src/contrib/service/consensus/meson.build3
-rw-r--r--src/contrib/service/conversation/Makefile.am24
-rw-r--r--src/contrib/service/conversation/meson.build3
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
83check_PROGRAMS = \ 83#check_PROGRAMS = \
84 test_consensus_api 84# test_consensus_api
85 85
86if ENABLE_TEST_RUN 86if ENABLE_TEST_RUN
87AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; 87AM_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?
50if false
50 51
51testconsensusapi = executable ('test_consensus_api', 52testconsensusapi = executable ('test_consensus_api',
52 ['test_consensus_api.c'], 53 ['test_consensus_api.c'],
@@ -64,3 +65,5 @@ configure_file(input : 'test_consensus.conf',
64test('test_consensus_api', testconsensusapi, 65test('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
69endif \ 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 = \
22libexec_PROGRAMS = \ 22libexec_PROGRAMS = \
23 gnunet-service-conversation 23 gnunet-service-conversation
24 24
25check_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
30pkgcfg_DATA = conversation.conf 30pkgcfg_DATA = conversation.conf
31endif 31endif
@@ -83,17 +83,17 @@ libgnunetconversation_la_LDFLAGS = \
83if BUILD_PULSE_HELPERS 83if BUILD_PULSE_HELPERS
84AUDIO_HELPER_RECD=gnunet-helper-audio-record 84AUDIO_HELPER_RECD=gnunet-helper-audio-record
85AUDIO_HELPER_PLAY=gnunet-helper-audio-playback 85AUDIO_HELPER_PLAY=gnunet-helper-audio-playback
86AUDIO_TESTS=$(check_PROGRAMS) 86#AUDIO_TESTS=$(check_PROGRAMS)
87else 87else
88if BUILD_GST_HELPERS 88if BUILD_GST_HELPERS
89AUDIO_HELPER_RECD=gnunet-helper-audio-record 89AUDIO_HELPER_RECD=gnunet-helper-audio-record
90AUDIO_HELPER_PLAY=gnunet-helper-audio-playback 90AUDIO_HELPER_PLAY=gnunet-helper-audio-playback
91AUDIO_TESTS=$(check_PROGRAMS) 91#AUDIO_TESTS=$(check_PROGRAMS)
92else 92else
93if BUILD_EXPERIMENTAL_HELPERS 93if BUILD_EXPERIMENTAL_HELPERS
94AUDIO_HELPER_RECD=gnunet-helper-audio-record 94AUDIO_HELPER_RECD=gnunet-helper-audio-record
95AUDIO_HELPER_PLAY=gnunet-helper-audio-playback 95AUDIO_HELPER_PLAY=gnunet-helper-audio-playback
96AUDIO_TESTS=$(check_PROGRAMS) 96#AUDIO_TESTS=$(check_PROGRAMS)
97endif 97endif
98endif 98endif
99endif 99endif
@@ -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
122gnunet_helper_audio_playback_SOURCES = \ 122gnunet_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#
130else 130else
131if BUILD_GST_HELPERS 131if BUILD_GST_HELPERS
132gnunet_helper_audio_record_SOURCES = \ 132gnunet_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
193gnunet_conversation_SOURCES = \ 193gnunet_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
208gnunet_conversation_test_SOURCES = \ 208gnunet_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
219test_conversation_api_SOURCES = \ 219test_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
148if false
149
148testconvapi = executable ('test_conversation_api', 150testconvapi = 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
201test('test_conversation_api_reject', testconvapireject, workdir: meson.current_build_dir(), 203test('test_conversation_api_reject', testconvapireject, workdir: meson.current_build_dir(),
202 suite: ['conversation', 'contrib']) 204 suite: ['conversation', 'contrib'])
203 205
206endif \ No newline at end of file