[GNUnet-SVN] [gnunet] branch master updated (35e5be0b0 -> ec3b834e1)

[gnunet]

This is an automated email from the git hooks/post-receive script.

xrs pushed a change to branch master
in repository gnunet.

    from 35e5be0b0 notes
     new 362779a72 Move from timer-based to callback-based updates in sampler
     new 461426cf3 Merge branch 'master' of ssh://gnunet.org/gnunet
     new 2770964bd Merge branch 'master' of ssh://gnunet.org/gnunet
     new cf4870390 Merge branch 'master' of ssh://gnunet.org/gnunet
     new d25f1b402 put old psyc test in place
     new ec3b834e1 Merge branch 'master' of ssh://gnunet.org/gnunet

The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/psyc/Makefile.am | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/psyc/Makefile.am b/src/psyc/Makefile.am
index d5c797f52..511e3e3f7 100644
--- a/src/psyc/Makefile.am
+++ b/src/psyc/Makefile.am
@@ -48,9 +48,9 @@ gnunet_service_psyc_CFLAGS = $(AM_CFLAGS)
 
 
 if HAVE_TESTING
-#check_PROGRAMS = \
+check_PROGRAMS = \
+ test_psyc
 # test_psyc2
-# test_psyc
 endif
 
 if ENABLE_TEST_RUN
@@ -58,20 +58,20 @@ AM_TESTS_ENVIRONMENT=export 
GNUNET_PREFIX=$${GNUNET_PREFIX:address@hidden@};export PAT
 TESTS = $(check_PROGRAMS)
 endif
 
-#test_psyc_SOURCES = \
-# test_psyc.c
-#test_psyc_LDADD = \
-#  libgnunetpsyc.la \
-#  $(top_builddir)/src/psycutil/libgnunetpsycutil.la \
-#  $(top_builddir)/src/testing/libgnunettesting.la \
-#  $(top_builddir)/src/util/libgnunetutil.la
-test_psyc2_SOURCES = \
-  test_psyc2.c
-test_psyc2_LDADD = \
+test_psyc_SOURCES = \
+ test_psyc.c
+test_psyc_LDADD = \
   libgnunetpsyc.la \
   $(top_builddir)/src/psycutil/libgnunetpsycutil.la \
-  $(top_builddir)/src/testbed/libgnunettestbed.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la
+#test_psyc2_SOURCES = \
+#  test_psyc2.c
+#test_psyc2_LDADD = \
+#  libgnunetpsyc.la \
+#  $(top_builddir)/src/psycutil/libgnunetpsycutil.la \
+#  $(top_builddir)/src/testbed/libgnunettestbed.la \
+#  $(top_builddir)/src/util/libgnunetutil.la
 
 EXTRA_DIST = \
   test_psyc.conf

-- 
To stop receiving notification emails like this one, please contact
address@hidden