diff options
author | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2019-12-22 12:41:26 +0900 |
---|---|---|
committer | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2019-12-22 12:41:26 +0900 |
commit | 6d8ba0321cde6cf5dd240b9cbcf36dc95bfdc798 (patch) | |
tree | 5c0964e7b3736667a27e735013f7d2d589c14845 /src/transport | |
parent | dc090c05b18f416543266e9f47f6a2cff0125b92 (diff) | |
download | gnunet-6d8ba0321cde6cf5dd240b9cbcf36dc95bfdc798.tar.gz gnunet-6d8ba0321cde6cf5dd240b9cbcf36dc95bfdc798.zip |
rename test as it is now communicator-independent
Diffstat (limited to 'src/transport')
-rw-r--r-- | src/transport/Makefile.am | 6 | ||||
-rw-r--r-- | src/transport/test_communicator.c (renamed from src/transport/test_communicator_unix.c) | 7 | ||||
-rw-r--r-- | src/transport/test_communicator_unix_peer1.conf (renamed from src/transport/test_communicator_1.conf) | 5 | ||||
-rw-r--r-- | src/transport/test_communicator_unix_peer2.conf (renamed from src/transport/test_communicator_2.conf) | 4 |
4 files changed, 15 insertions, 7 deletions
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index a5b9aaaa8..ff9d7aec7 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am | |||
@@ -783,7 +783,7 @@ test_plugin_udp_LDADD = \ | |||
783 | endif | 783 | endif |
784 | 784 | ||
785 | test_communicator_unix_SOURCES = \ | 785 | test_communicator_unix_SOURCES = \ |
786 | test_communicator_unix.c | 786 | test_communicator.c |
787 | test_communicator_unix_LDADD = \ | 787 | test_communicator_unix_LDADD = \ |
788 | libgnunettransporttesting2.la \ | 788 | libgnunettransporttesting2.la \ |
789 | $(top_builddir)/src/testing/libgnunettesting.la \ | 789 | $(top_builddir)/src/testing/libgnunettesting.la \ |
@@ -1486,5 +1486,5 @@ test_transport_api_slow_ats_peer2.conf \ | |||
1486 | tcp_server_mst_legacy.c \ | 1486 | tcp_server_mst_legacy.c \ |
1487 | tcp_server_legacy.c \ | 1487 | tcp_server_legacy.c \ |
1488 | tcp_service_legacy.c \ | 1488 | tcp_service_legacy.c \ |
1489 | test_communicator_1.conf \ | 1489 | test_communicator_unix_peer1.conf \ |
1490 | test_communicator_1.conf | 1490 | test_communicator_unix_peer2.conf |
diff --git a/src/transport/test_communicator_unix.c b/src/transport/test_communicator.c index 83ab1ea26..34be5d66a 100644 --- a/src/transport/test_communicator_unix.c +++ b/src/transport/test_communicator.c | |||
@@ -19,9 +19,10 @@ | |||
19 | */ | 19 | */ |
20 | 20 | ||
21 | /** | 21 | /** |
22 | * @file transport/test_communicator_unix.c | 22 | * @file transport/test_communicator.c |
23 | * @brief test the unix communicator | 23 | * @brief test the communicators |
24 | * @author Julius Bünger | 24 | * @author Julius Bünger |
25 | * @author Martin Schanzenbach | ||
25 | */ | 26 | */ |
26 | #include "platform.h" | 27 | #include "platform.h" |
27 | #include "gnunet_util_lib.h" | 28 | #include "gnunet_util_lib.h" |
@@ -35,7 +36,7 @@ | |||
35 | 36 | ||
36 | 37 | ||
37 | #define LOG(kind, ...) GNUNET_log_from (kind, \ | 38 | #define LOG(kind, ...) GNUNET_log_from (kind, \ |
38 | "test_transport_communicator_unix", \ | 39 | "test_transport_communicator", \ |
39 | __VA_ARGS__) | 40 | __VA_ARGS__) |
40 | 41 | ||
41 | #define NUM_PEERS 2 | 42 | #define NUM_PEERS 2 |
diff --git a/src/transport/test_communicator_1.conf b/src/transport/test_communicator_unix_peer1.conf index af221e1d3..f0d5ac299 100644 --- a/src/transport/test_communicator_1.conf +++ b/src/transport/test_communicator_unix_peer1.conf | |||
@@ -1,7 +1,10 @@ | |||
1 | @INLINE@ test_transport_defaults.conf | 1 | @INLINE@ test_transport_defaults.conf |
2 | 2 | ||
3 | [PATHS] | 3 | [PATHS] |
4 | GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunetd-plugin-transport/ | 4 | GNUNET_TEST_HOME = $GNUNET_TMP/test-communicator-unix-1/ |
5 | |||
6 | [PEER] | ||
7 | PRIVATE_KEY = $GNUNET_TMP/test-communicator-unix-1/private.key | ||
5 | 8 | ||
6 | [transport-tcp] | 9 | [transport-tcp] |
7 | PORT = 52400 | 10 | PORT = 52400 |
diff --git a/src/transport/test_communicator_2.conf b/src/transport/test_communicator_unix_peer2.conf index 46a132648..1897f4039 100644 --- a/src/transport/test_communicator_2.conf +++ b/src/transport/test_communicator_unix_peer2.conf | |||
@@ -3,6 +3,10 @@ | |||
3 | [PATHS] | 3 | [PATHS] |
4 | GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunetd-plugin-transport/ | 4 | GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunetd-plugin-transport/ |
5 | 5 | ||
6 | [PEER] | ||
7 | PRIVATE_KEY = $GNUNET_TMP/test-communicator-unix-2/private.key | ||
8 | |||
9 | |||
6 | [transport-tcp] | 10 | [transport-tcp] |
7 | PORT = 52400 | 11 | PORT = 52400 |
8 | 12 | ||