[GNUnet-SVN] r30688 - gnunet/src/conversation

[gnunet]

Author: grothoff
Date: 2013-11-14 13:20:27 +0100 (Thu, 14 Nov 2013)
New Revision: 30688

Modified:
   gnunet/src/conversation/Makefile.am
   gnunet/src/conversation/test_conversation_api.c
Log:
-only run tests if we actually had pulse/opus

Modified: gnunet/src/conversation/Makefile.am
===================================================================
--- gnunet/src/conversation/Makefile.am 2013-11-14 12:18:18 UTC (rev 30687)
+++ gnunet/src/conversation/Makefile.am 2013-11-14 12:20:27 UTC (rev 30688)
@@ -76,13 +76,15 @@
 endif
 
 
-
 check_PROGRAMS = \
  test_conversation_api
 
+if HAVE_PULSE
+if HAVE_OPUS
 TESTS = $(check_PROGRAMS)
+endif
+endif
 
-
 gnunet_helper_audio_record_SOURCES = \
   gnunet-helper-audio-record.c
 gnunet_helper_audio_record_LDADD = \

Modified: gnunet/src/conversation/test_conversation_api.c
===================================================================
--- gnunet/src/conversation/test_conversation_api.c     2013-11-14 12:18:18 UTC 
(rev 30687)
+++ gnunet/src/conversation/test_conversation_api.c     2013-11-14 12:20:27 UTC 
(rev 30688)
@@ -48,13 +48,14 @@
   };
   struct GNUNET_OS_Process *proc;
   char *path = GNUNET_OS_get_libexec_binary_path ( 
"gnunet-service-conversation");
+
   if (NULL == path)
   {
     fprintf (stderr, "Service executable not found `%s'\n", 
"gnunet-service-conversation");
     return 0;
   }
   proc = GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_ALL, NULL, 
NULL,
-                               path,
+                                  path,
                                  "gnunet-service-conversation",
                                  NULL);