projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid dvision by zero
[oweals/gnunet.git]
/
src
/
multicast
/
Makefile.am
diff --git
a/src/multicast/Makefile.am
b/src/multicast/Makefile.am
index 8a754d3db35f9a867acf8e9569ee8261a57025aa..61a9f8bf699c8793d1ad9fcae8603940c44eb11f 100644
(file)
--- a/
src/multicast/Makefile.am
+++ b/
src/multicast/Makefile.am
@@
-19,8
+19,7
@@
endif
lib_LTLIBRARIES = libgnunetmulticast.la
libgnunetmulticast_la_SOURCES = \
lib_LTLIBRARIES = libgnunetmulticast.la
libgnunetmulticast_la_SOURCES = \
- multicast_api.c \
- multicast.h
+ multicast_api.c multicast.h
libgnunetmulticast_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
$(GN_LIBINTL) $(XLIB)
libgnunetmulticast_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
$(GN_LIBINTL) $(XLIB)
@@
-51,13
+50,12
@@
gnunet_service_multicast_LDADD = \
$(GN_LIBINTL)
check_PROGRAMS = \
$(GN_LIBINTL)
check_PROGRAMS = \
- test_multicast
_multipeer
-# test_multicast
-# test_multicast_2peers
+ test_multicast
\
+ test_multicast_multipeer_star \
+ test_multicast_multipeer_line
if ENABLE_TEST_RUN
AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@}; export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; unset XDG_DATA_HOME; unset XDG_CONFIG_HOME;
if ENABLE_TEST_RUN
AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@}; export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; unset XDG_DATA_HOME; unset XDG_CONFIG_HOME;
-#AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@}; export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; unset XDG_DATA_HOME; unset XDG_CONFIG_HOME; export GNUNET_FORCE_LOG=';;;;INFO';
TESTS = $(check_PROGRAMS)
endif
TESTS = $(check_PROGRAMS)
endif
@@
-67,17
+65,15
@@
test_multicast_LDADD = \
libgnunetmulticast.la \
$(top_builddir)/src/testing/libgnunettesting.la \
$(top_builddir)/src/util/libgnunetutil.la
libgnunetmulticast.la \
$(top_builddir)/src/testing/libgnunettesting.la \
$(top_builddir)/src/util/libgnunetutil.la
-
-test_multicast_multipeer_SOURCES = \
+test_multicast_multipeer_star_SOURCES = \
test_multicast_multipeer.c
test_multicast_multipeer.c
-test_multicast_multipeer_LDADD = \
+test_multicast_multipeer_
star_
LDADD = \
libgnunetmulticast.la \
$(top_builddir)/src/testbed/libgnunettestbed.la \
$(top_builddir)/src/util/libgnunetutil.la
libgnunetmulticast.la \
$(top_builddir)/src/testbed/libgnunettestbed.la \
$(top_builddir)/src/util/libgnunetutil.la
-
-test_multicast_2peers_SOURCES = \
- test_multicast_2peers.c
-test_multicast_2peers_LDADD = \
+test_multicast_multipeer_line_SOURCES = \
+ test_multicast_multipeer.c
+test_multicast_multipeer_line_LDADD = \
libgnunetmulticast.la \
$(top_builddir)/src/testbed/libgnunettestbed.la \
$(top_builddir)/src/util/libgnunetutil.la
libgnunetmulticast.la \
$(top_builddir)/src/testbed/libgnunettestbed.la \
$(top_builddir)/src/util/libgnunetutil.la