[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r33362 - gnunet/src/cadet
From: |
gnunet |
Subject: |
[GNUnet-SVN] r33362 - gnunet/src/cadet |
Date: |
Fri, 23 May 2014 02:37:52 +0200 |
Author: bartpolot
Date: 2014-05-23 02:37:52 +0200 (Fri, 23 May 2014)
New Revision: 33362
Modified:
gnunet/src/cadet/Makefile.am
gnunet/src/cadet/test_cadet.c
Log:
- simplify names, update Makefile
Modified: gnunet/src/cadet/Makefile.am
===================================================================
--- gnunet/src/cadet/Makefile.am 2014-05-23 00:37:50 UTC (rev 33361)
+++ gnunet/src/cadet/Makefile.am 2014-05-23 00:37:52 UTC (rev 33362)
@@ -100,14 +100,22 @@
check_PROGRAMS = \
test_cadet_single \
test_cadet_local \
- test_cadet_forward \
- test_cadet_signal \
- test_cadet_keepalive \
- test_cadet_speed \
- test_cadet_speed_ack \
- test_cadet_speed_backwards \
- test_cadet_speed_reliable \
- test_cadet_speed_reliable_backwards
+ test_2_cadet_forward \
+ test_2_cadet_signal \
+ test_2_cadet_keepalive \
+ test_2_cadet_speed \
+ test_2_cadet_speed_ack \
+ test_2_cadet_speed_backwards \
+ test_2_cadet_speed_reliable \
+ test_2_cadet_speed_reliable_backwards \
+ test_5_cadet_forward \
+ test_5_cadet_signal \
+ test_5_cadet_keepalive \
+ test_5_cadet_speed \
+ test_5_cadet_speed_ack \
+ test_5_cadet_speed_backwards \
+ test_5_cadet_speed_reliable \
+ test_5_cadet_speed_reliable_backwards
endif
ld_cadet_test_lib = \
@@ -140,47 +148,91 @@
test_cadet_local_LDADD = $(ld_cadet_test_lib)
test_cadet_local_DEPENDENCIES = $(dep_cadet_test_lib)
-test_cadet_forward_SOURCES = \
+
+
+test_2_cadet_forward_SOURCES = \
test_cadet.c
-test_cadet_forward_LDADD = $(ld_cadet_test_lib)
-test_cadet_forward_DEPENDENCIES = $(dep_cadet_test_lib)
+test_2_cadet_forward_LDADD = $(ld_cadet_test_lib)
+test_2_cadet_forward_DEPENDENCIES = $(dep_cadet_test_lib)
-test_cadet_signal_SOURCES = \
+test_2_cadet_signal_SOURCES = \
test_cadet.c
-test_cadet_signal_LDADD = $(ld_cadet_test_lib)
-test_cadet_signal_DEPENDENCIES = $(dep_cadet_test_lib)
+test_2_cadet_signal_LDADD = $(ld_cadet_test_lib)
+test_2_cadet_signal_DEPENDENCIES = $(dep_cadet_test_lib)
-test_cadet_keepalive_SOURCES = \
+test_2_cadet_keepalive_SOURCES = \
test_cadet.c
-test_cadet_keepalive_LDADD = $(ld_cadet_test_lib)
-test_cadet_keepalive_DEPENDENCIES = $(dep_cadet_test_lib)
+test_2_cadet_keepalive_LDADD = $(ld_cadet_test_lib)
+test_2_cadet_keepalive_DEPENDENCIES = $(dep_cadet_test_lib)
-test_cadet_speed_SOURCES = \
+test_2_cadet_speed_SOURCES = \
test_cadet.c
-test_cadet_speed_LDADD = $(ld_cadet_test_lib)
-test_cadet_speed_DEPENDENCIES = $(dep_cadet_test_lib)
+test_2_cadet_speed_LDADD = $(ld_cadet_test_lib)
+test_2_cadet_speed_DEPENDENCIES = $(dep_cadet_test_lib)
-test_cadet_speed_ack_SOURCES = \
+test_2_cadet_speed_ack_SOURCES = \
test_cadet.c
-test_cadet_speed_ack_LDADD = $(ld_cadet_test_lib)
-test_cadet_speed_ack_DEPENDENCIES = $(dep_cadet_test_lib)
+test_2_cadet_speed_ack_LDADD = $(ld_cadet_test_lib)
+test_2_cadet_speed_ack_DEPENDENCIES = $(dep_cadet_test_lib)
-test_cadet_speed_backwards_SOURCES = \
+test_2_cadet_speed_backwards_SOURCES = \
test_cadet.c
-test_cadet_speed_backwards_LDADD = $(ld_cadet_test_lib)
-test_cadet_speed_backwards_DEPENDENCIES = $(dep_cadet_test_lib)
+test_2_cadet_speed_backwards_LDADD = $(ld_cadet_test_lib)
+test_2_cadet_speed_backwards_DEPENDENCIES = $(dep_cadet_test_lib)
-test_cadet_speed_reliable_SOURCES = \
+test_2_cadet_speed_reliable_SOURCES = \
test_cadet.c
-test_cadet_speed_reliable_LDADD = $(ld_cadet_test_lib)
-test_cadet_speed_reliable_DEPENDENCIES = $(dep_cadet_test_lib)
+test_2_cadet_speed_reliable_LDADD = $(ld_cadet_test_lib)
+test_2_cadet_speed_reliable_DEPENDENCIES = $(dep_cadet_test_lib)
-test_cadet_speed_reliable_backwards_SOURCES = \
+test_2_cadet_speed_reliable_backwards_SOURCES = \
test_cadet.c
-test_cadet_speed_reliable_backwards_LDADD = $(ld_cadet_test_lib)
-test_cadet_speed_reliable_backwards_DEPENDENCIES = $(dep_cadet_test_lib)
+test_2_cadet_speed_reliable_backwards_LDADD = $(ld_cadet_test_lib)
+test_2_cadet_speed_reliable_backwards_DEPENDENCIES = $(dep_cadet_test_lib)
+
+test_5_cadet_forward_SOURCES = \
+ test_cadet.c
+test_5_cadet_forward_LDADD = $(ld_cadet_test_lib)
+test_5_cadet_forward_DEPENDENCIES = $(dep_cadet_test_lib)
+
+test_5_cadet_signal_SOURCES = \
+ test_cadet.c
+test_5_cadet_signal_LDADD = $(ld_cadet_test_lib)
+test_5_cadet_signal_DEPENDENCIES = $(dep_cadet_test_lib)
+
+test_5_cadet_keepalive_SOURCES = \
+ test_cadet.c
+test_5_cadet_keepalive_LDADD = $(ld_cadet_test_lib)
+test_5_cadet_keepalive_DEPENDENCIES = $(dep_cadet_test_lib)
+
+test_5_cadet_speed_SOURCES = \
+ test_cadet.c
+test_5_cadet_speed_LDADD = $(ld_cadet_test_lib)
+test_5_cadet_speed_DEPENDENCIES = $(dep_cadet_test_lib)
+
+test_5_cadet_speed_ack_SOURCES = \
+ test_cadet.c
+test_5_cadet_speed_ack_LDADD = $(ld_cadet_test_lib)
+test_5_cadet_speed_ack_DEPENDENCIES = $(dep_cadet_test_lib)
+
+test_5_cadet_speed_backwards_SOURCES = \
+ test_cadet.c
+test_5_cadet_speed_backwards_LDADD = $(ld_cadet_test_lib)
+test_5_cadet_speed_backwards_DEPENDENCIES = $(dep_cadet_test_lib)
+
+test_5_cadet_speed_reliable_SOURCES = \
+ test_cadet.c
+test_5_cadet_speed_reliable_LDADD = $(ld_cadet_test_lib)
+test_5_cadet_speed_reliable_DEPENDENCIES = $(dep_cadet_test_lib)
+
+test_5_cadet_speed_reliable_backwards_SOURCES = \
+ test_cadet.c
+test_5_cadet_speed_reliable_backwards_LDADD = $(ld_cadet_test_lib)
+test_5_cadet_speed_reliable_backwards_DEPENDENCIES = $(dep_cadet_test_lib)
+
+
if ENABLE_TEST_RUN
AM_TESTS_ENVIRONMENT=export
GNUNET_PREFIX=$${GNUNET_PREFIX:address@hidden@};export
PATH=$${GNUNET_PREFIX:address@hidden@}/bin:$$PATH;
TESTS = \
Modified: gnunet/src/cadet/test_cadet.c
===================================================================
--- gnunet/src/cadet/test_cadet.c 2014-05-23 00:37:50 UTC (rev 33361)
+++ gnunet/src/cadet/test_cadet.c 2014-05-23 00:37:52 UTC (rev 33362)
@@ -863,12 +863,12 @@
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Start\n");
/* Find out requested size */
- if (strstr (argv[0], "test_direct") != NULL)
+ if (strstr (argv[0], "_2_") != NULL)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "DIRECT CONNECTIONs\n");
peers_requested = 2;
}
- else if (strstr (argv[0], "test_small") != NULL)
+ else if (strstr (argv[0], "_5_") != NULL)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "5 PEER LINE\n");
peers_requested = 5;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r33362 - gnunet/src/cadet,
gnunet <=