- rename tests

diff --git a/.gitignore b/.gitignore
index 6189c6406dd0eb3fa660d8605949a3493480c5dc..8e923b5b62bf83d9308710db00d3f1128897817b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-*~
+!*~
 */*~
 # /
 *log
@@ -766,17 +766,17 @@
 /src/cadet/gnunet-cadet-profiler
 /src/cadet/.profiler.conf
 /src/cadet/test_cadet_single
-/src/cadet/test_*cadet_forward
-/src/cadet/test_*cadet_signal
-/src/cadet/test_*cadet_keepalive
-/src/cadet/test_*cadet_speed
-/src/cadet/test_*cadet_speed_min
-/src/cadet/test_*cadet_speed_ack
-/src/cadet/test_*cadet_speed_backwards
-/src/cadet/test_*cadet_speed_min_backwards
-/src/cadet/test_*cadet_speed_ack
-/src/cadet/test_*cadet_speed_reliable
-/src/cadet/test_*cadet_speed_reliable_backwards
+/src/cadet/test_cadet*_forward
+/src/cadet/test_cadet*_signal
+/src/cadet/test_cadet*_keepalive
+/src/cadet/test_cadet*_speed
+/src/cadet/test_cadet*_speed_min
+/src/cadet/test_cadet*_speed_ack
+/src/cadet/test_cadet*_speed_backwards
+/src/cadet/test_cadet*_speed_min_backwards
+/src/cadet/test_cadet*_speed_ack
+/src/cadet/test_cadet*_speed_reliable
+/src/cadet/test_cadet*_speed_reliable_backwards
 /src/cadet/test_cadet_api
 /src/cadet/test_cadet_tree_api
 /src/cadet/test_cadet_local

diff --git a/src/cadet/Makefile.am b/src/cadet/Makefile.am
index 504621a6af3002c74d3f5777566097e07dd83b9c..86bd439d192c243dd7a03647d359bc743ff51dbd 100644 (file)
--- a/src/cadet/Makefile.am
+++ b/src/cadet/Makefile.am
@@ -100,22 +100,22 @@ if HAVE_TESTING
 check_PROGRAMS = \
   test_cadet_single \
   test_cadet_local \
-  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
+  test_cadet_2_forward \
+  test_cadet_2_signal \
+  test_cadet_2_keepalive \
+  test_cadet_2_speed \
+  test_cadet_2_speed_ack \
+  test_cadet_2_speed_backwards \
+  test_cadet_2_speed_reliable \
+  test_cadet_2_speed_reliable_backwards \
+  test_cadet_5_forward \
+  test_cadet_5_signal \
+  test_cadet_5_keepalive \
+  test_cadet_5_speed \
+  test_cadet_5_speed_ack \
+  test_cadet_5_speed_backwards \
+  test_cadet_5_speed_reliable \
+  test_cadet_5_speed_reliable_backwards
 endif
 
 ld_cadet_test_lib = \
@@ -150,87 +150,87 @@ test_cadet_local_DEPENDENCIES = $(dep_cadet_test_lib)
 
 
 
-test_2_cadet_forward_SOURCES = \
+test_cadet_2_forward_SOURCES = \
   test_cadet.c
-test_2_cadet_forward_LDADD = $(ld_cadet_test_lib)
-test_2_cadet_forward_DEPENDENCIES = $(dep_cadet_test_lib)
+test_cadet_2_forward_LDADD = $(ld_cadet_test_lib)
+test_cadet_2_forward_DEPENDENCIES = $(dep_cadet_test_lib)
 
-test_2_cadet_signal_SOURCES = \
+test_cadet_2_signal_SOURCES = \
   test_cadet.c
-test_2_cadet_signal_LDADD = $(ld_cadet_test_lib)
-test_2_cadet_signal_DEPENDENCIES = $(dep_cadet_test_lib)
+test_cadet_2_signal_LDADD = $(ld_cadet_test_lib)
+test_cadet_2_signal_DEPENDENCIES = $(dep_cadet_test_lib)
 
-test_2_cadet_keepalive_SOURCES = \
+test_cadet_2_keepalive_SOURCES = \
   test_cadet.c
-test_2_cadet_keepalive_LDADD = $(ld_cadet_test_lib)
-test_2_cadet_keepalive_DEPENDENCIES = $(dep_cadet_test_lib)
+test_cadet_2_keepalive_LDADD = $(ld_cadet_test_lib)
+test_cadet_2_keepalive_DEPENDENCIES = $(dep_cadet_test_lib)
 
-test_2_cadet_speed_SOURCES = \
+test_cadet_2_speed_SOURCES = \
   test_cadet.c
-test_2_cadet_speed_LDADD = $(ld_cadet_test_lib)
-test_2_cadet_speed_DEPENDENCIES = $(dep_cadet_test_lib)
+test_cadet_2_speed_LDADD = $(ld_cadet_test_lib)
+test_cadet_2_speed_DEPENDENCIES = $(dep_cadet_test_lib)
 
-test_2_cadet_speed_ack_SOURCES = \
+test_cadet_2_speed_ack_SOURCES = \
   test_cadet.c
-test_2_cadet_speed_ack_LDADD = $(ld_cadet_test_lib)
-test_2_cadet_speed_ack_DEPENDENCIES = $(dep_cadet_test_lib)
+test_cadet_2_speed_ack_LDADD = $(ld_cadet_test_lib)
+test_cadet_2_speed_ack_DEPENDENCIES = $(dep_cadet_test_lib)
 
-test_2_cadet_speed_backwards_SOURCES = \
+test_cadet_2_speed_backwards_SOURCES = \
   test_cadet.c
-test_2_cadet_speed_backwards_LDADD = $(ld_cadet_test_lib)
-test_2_cadet_speed_backwards_DEPENDENCIES = $(dep_cadet_test_lib)
+test_cadet_2_speed_backwards_LDADD = $(ld_cadet_test_lib)
+test_cadet_2_speed_backwards_DEPENDENCIES = $(dep_cadet_test_lib)
 
-test_2_cadet_speed_reliable_SOURCES = \
+test_cadet_2_speed_reliable_SOURCES = \
   test_cadet.c
-test_2_cadet_speed_reliable_LDADD = $(ld_cadet_test_lib)
-test_2_cadet_speed_reliable_DEPENDENCIES = $(dep_cadet_test_lib)
+test_cadet_2_speed_reliable_LDADD = $(ld_cadet_test_lib)
+test_cadet_2_speed_reliable_DEPENDENCIES = $(dep_cadet_test_lib)
 
-test_2_cadet_speed_reliable_backwards_SOURCES = \
+test_cadet_2_speed_reliable_backwards_SOURCES = \
   test_cadet.c
-test_2_cadet_speed_reliable_backwards_LDADD = $(ld_cadet_test_lib)
-test_2_cadet_speed_reliable_backwards_DEPENDENCIES = $(dep_cadet_test_lib)
+test_cadet_2_speed_reliable_backwards_LDADD = $(ld_cadet_test_lib)
+test_cadet_2_speed_reliable_backwards_DEPENDENCIES = $(dep_cadet_test_lib)
 
 
 
-test_5_cadet_forward_SOURCES = \
+test_cadet_5_forward_SOURCES = \
   test_cadet.c
-test_5_cadet_forward_LDADD = $(ld_cadet_test_lib)
-test_5_cadet_forward_DEPENDENCIES = $(dep_cadet_test_lib)
+test_cadet_5_forward_LDADD = $(ld_cadet_test_lib)
+test_cadet_5_forward_DEPENDENCIES = $(dep_cadet_test_lib)
 
-test_5_cadet_signal_SOURCES = \
+test_cadet_5_signal_SOURCES = \
   test_cadet.c
-test_5_cadet_signal_LDADD = $(ld_cadet_test_lib)
-test_5_cadet_signal_DEPENDENCIES = $(dep_cadet_test_lib)
+test_cadet_5_signal_LDADD = $(ld_cadet_test_lib)
+test_cadet_5_signal_DEPENDENCIES = $(dep_cadet_test_lib)
 
-test_5_cadet_keepalive_SOURCES = \
+test_cadet_5_keepalive_SOURCES = \
   test_cadet.c
-test_5_cadet_keepalive_LDADD = $(ld_cadet_test_lib)
-test_5_cadet_keepalive_DEPENDENCIES = $(dep_cadet_test_lib)
+test_cadet_5_keepalive_LDADD = $(ld_cadet_test_lib)
+test_cadet_5_keepalive_DEPENDENCIES = $(dep_cadet_test_lib)
 
-test_5_cadet_speed_SOURCES = \
+test_cadet_5_speed_SOURCES = \
   test_cadet.c
-test_5_cadet_speed_LDADD = $(ld_cadet_test_lib)
-test_5_cadet_speed_DEPENDENCIES = $(dep_cadet_test_lib)
+test_cadet_5_speed_LDADD = $(ld_cadet_test_lib)
+test_cadet_5_speed_DEPENDENCIES = $(dep_cadet_test_lib)
 
-test_5_cadet_speed_ack_SOURCES = \
+test_cadet_5_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_cadet_5_speed_ack_LDADD = $(ld_cadet_test_lib)
+test_cadet_5_speed_ack_DEPENDENCIES = $(dep_cadet_test_lib)
 
-test_5_cadet_speed_backwards_SOURCES = \
+test_cadet_5_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_cadet_5_speed_backwards_LDADD = $(ld_cadet_test_lib)
+test_cadet_5_speed_backwards_DEPENDENCIES = $(dep_cadet_test_lib)
 
-test_5_cadet_speed_reliable_SOURCES = \
+test_cadet_5_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_cadet_5_speed_reliable_LDADD = $(ld_cadet_test_lib)
+test_cadet_5_speed_reliable_DEPENDENCIES = $(dep_cadet_test_lib)
 
-test_5_cadet_speed_reliable_backwards_SOURCES = \
+test_cadet_5_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)
+test_cadet_5_speed_reliable_backwards_LDADD = $(ld_cadet_test_lib)
+test_cadet_5_speed_reliable_backwards_DEPENDENCIES = $(dep_cadet_test_lib)
 
 
 if ENABLE_TEST_RUN