diff options
| author | xrs <xrs@mail36.net> | 2017-03-13 20:35:18 +0100 |
|---|---|---|
| committer | xrs <xrs@mail36.net> | 2017-03-13 20:35:18 +0100 |
| commit | 9f68c9e7d383061abbc81d1590abf25cde2305fe (patch) | |
| tree | 971a0188e84878f43c2074def4ac3531c73acba6 /src/multicast/Makefile.am | |
| parent | 501c1f7794be6e8a2ea15200dbdadd4c066edb89 (diff) | |
| parent | 8691934f57063bfa5032f4e34836ecbcb3d761e9 (diff) | |
Merge branch 'master' of ssh://gnunet.org/gnunet
Conflicts:
src/multicast/test_multicast_2peers.c
Diffstat (limited to 'src/multicast/Makefile.am')
| -rw-r--r-- | src/multicast/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/multicast/Makefile.am b/src/multicast/Makefile.am index 2a00a7a027..8a754d3db3 100644 --- a/src/multicast/Makefile.am +++ b/src/multicast/Makefile.am @@ -51,9 +51,9 @@ gnunet_service_multicast_LDADD = \ $(GN_LIBINTL) check_PROGRAMS = \ - test_multicast \ - test_multicast_2peers -# test_multicast_multipeer + test_multicast_multipeer +# test_multicast +# test_multicast_2peers 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; |