aboutsummaryrefslogtreecommitdiff
path: root/src/conversation
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-11-14 12:20:27 +0000
committerChristian Grothoff <christian@grothoff.org>2013-11-14 12:20:27 +0000
commitfceea8076488d3da8d52aaf4ccd966eac57b2734 (patch)
treed2a3b18e4bac586dcf8700aebd3308afa1fd26de /src/conversation
parent49dae49c8a2bf3682e20365f026fc087d27937e9 (diff)
downloadgnunet-fceea8076488d3da8d52aaf4ccd966eac57b2734.tar.gz
gnunet-fceea8076488d3da8d52aaf4ccd966eac57b2734.zip
-only run tests if we actually had pulse/opus
Diffstat (limited to 'src/conversation')
-rw-r--r--src/conversation/Makefile.am6
-rw-r--r--src/conversation/test_conversation_api.c3
2 files changed, 6 insertions, 3 deletions
diff --git a/src/conversation/Makefile.am b/src/conversation/Makefile.am
index 836a61fb4..b9e0c99b6 100644
--- a/src/conversation/Makefile.am
+++ b/src/conversation/Makefile.am
@@ -76,12 +76,14 @@ endif
76endif 76endif
77 77
78 78
79
80check_PROGRAMS = \ 79check_PROGRAMS = \
81 test_conversation_api 80 test_conversation_api
82 81
82if HAVE_PULSE
83if HAVE_OPUS
83TESTS = $(check_PROGRAMS) 84TESTS = $(check_PROGRAMS)
84 85endif
86endif
85 87
86gnunet_helper_audio_record_SOURCES = \ 88gnunet_helper_audio_record_SOURCES = \
87 gnunet-helper-audio-record.c 89 gnunet-helper-audio-record.c
diff --git a/src/conversation/test_conversation_api.c b/src/conversation/test_conversation_api.c
index d18616721..101245c9e 100644
--- a/src/conversation/test_conversation_api.c
+++ b/src/conversation/test_conversation_api.c
@@ -48,13 +48,14 @@ check ()
48 }; 48 };
49 struct GNUNET_OS_Process *proc; 49 struct GNUNET_OS_Process *proc;
50 char *path = GNUNET_OS_get_libexec_binary_path ( "gnunet-service-conversation"); 50 char *path = GNUNET_OS_get_libexec_binary_path ( "gnunet-service-conversation");
51
51 if (NULL == path) 52 if (NULL == path)
52 { 53 {
53 fprintf (stderr, "Service executable not found `%s'\n", "gnunet-service-conversation"); 54 fprintf (stderr, "Service executable not found `%s'\n", "gnunet-service-conversation");
54 return 0; 55 return 0;
55 } 56 }
56 proc = GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_ALL, NULL, NULL, 57 proc = GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_ALL, NULL, NULL,
57 path, 58 path,
58 "gnunet-service-conversation", 59 "gnunet-service-conversation",
59 NULL); 60 NULL);
60 61