diff options
author | Martin Schanzenbach <schanzen@gnunet.org> | 2024-03-02 10:01:00 +0100 |
---|---|---|
committer | Martin Schanzenbach <schanzen@gnunet.org> | 2024-03-02 10:01:00 +0100 |
commit | 571599776bfd4b416e9e09217195c0fc5a41e86e (patch) | |
tree | 5ab350b317e8645ae56e5f050ab0910853c10481 | |
parent | a1bc02db87142fb9f8f1f5902bbdda9bb0e0f5f7 (diff) | |
download | gnunet-571599776bfd4b416e9e09217195c0fc5a41e86e.tar.gz gnunet-571599776bfd4b416e9e09217195c0fc5a41e86e.zip |
TRANSPORT: Move defunct tests to experimental
m--------- | contrib/gana | 0 | ||||
m--------- | contrib/handbook | 0 | ||||
-rw-r--r-- | po/POTFILES.in | 1 | ||||
-rw-r--r-- | src/service/transport/Makefile.am | 15 | ||||
-rwxr-xr-x | src/service/transport/test_transport_start_testcase.sh | 22 |
5 files changed, 17 insertions, 21 deletions
diff --git a/contrib/gana b/contrib/gana | |||
Subproject 72be9c8454abc39eb35e1019545ceda8ece7a6d | Subproject 2b581279ae67a1068b07a8c010ac1ab7b85e18d | ||
diff --git a/contrib/handbook b/contrib/handbook | |||
Subproject 5dde35573cfc8e22bbf2810fb5bacc22726ac74 | Subproject f9368db2bf8ce9eb6a9e951891142309c9c898d | ||
diff --git a/po/POTFILES.in b/po/POTFILES.in index 685d992d1..7eb136496 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in | |||
@@ -159,6 +159,7 @@ src/lib/util/crypto_ecc_dlog.c | |||
159 | src/lib/util/crypto_ecc_gnsrecord.c | 159 | src/lib/util/crypto_ecc_gnsrecord.c |
160 | src/lib/util/crypto_ecc_setup.c | 160 | src/lib/util/crypto_ecc_setup.c |
161 | src/lib/util/crypto_edx25519.c | 161 | src/lib/util/crypto_edx25519.c |
162 | src/lib/util/crypto_elligator.c | ||
162 | src/lib/util/crypto_hash.c | 163 | src/lib/util/crypto_hash.c |
163 | src/lib/util/crypto_hash_file.c | 164 | src/lib/util/crypto_hash_file.c |
164 | src/lib/util/crypto_hkdf.c | 165 | src/lib/util/crypto_hkdf.c |
diff --git a/src/service/transport/Makefile.am b/src/service/transport/Makefile.am index e15a9b029..03c726dc5 100644 --- a/src/service/transport/Makefile.am +++ b/src/service/transport/Makefile.am | |||
@@ -293,15 +293,16 @@ libgnunet_test_transport_plugin_cmd_simple_send_dv_la_LDFLAGS = \ | |||
293 | $(GN_PLUGIN_LDFLAGS) | 293 | $(GN_PLUGIN_LDFLAGS) |
294 | 294 | ||
295 | check_PROGRAMS = \ | 295 | check_PROGRAMS = \ |
296 | test_communicator_basic-unix \ | ||
297 | test_communicator_basic-tcp \ | 296 | test_communicator_basic-tcp \ |
298 | test_communicator_basic-udp \ | 297 | test_communicator_basic-udp \ |
299 | test_communicator_basic-quic \ | ||
300 | test_communicator_rekey-tcp \ | 298 | test_communicator_rekey-tcp \ |
301 | test_communicator_rekey-udp \ | 299 | test_communicator_rekey-udp \ |
302 | test_communicator_backchannel-udp \ | 300 | test_communicator_backchannel-udp \ |
303 | test_communicator_bidirect-tcp | 301 | test_communicator_bidirect-tcp |
304 | 302 | ||
303 | if HAVE_EXPERIMENTAL | ||
304 | check_PROGRAMS += test_communicator_basic-quic \ | ||
305 | test_communicator_basic-unix | ||
305 | check_SCRIPTS= \ | 306 | check_SCRIPTS= \ |
306 | test_transport_start_testcase.sh \ | 307 | test_transport_start_testcase.sh \ |
307 | test_transport_simple_send_performance.sh \ | 308 | test_transport_simple_send_performance.sh \ |
@@ -313,19 +314,13 @@ check_SCRIPTS= \ | |||
313 | test_transport_udp_backchannel.sh \ | 314 | test_transport_udp_backchannel.sh \ |
314 | test_transport_simple_send_dv_circle.sh \ | 315 | test_transport_simple_send_dv_circle.sh \ |
315 | test_transport_simple_send_dv_inverse.sh | 316 | test_transport_simple_send_dv_inverse.sh |
317 | endif | ||
316 | 318 | ||
317 | if ENABLE_TEST_RUN | 319 | if ENABLE_TEST_RUN |
318 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; | 320 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; |
319 | TESTS = \ | 321 | TESTS = \ |
320 | $(check_SCRIPTS) \ | 322 | $(check_SCRIPTS) \ |
321 | test_communicator_basic-unix \ | 323 | $(check_PROGRAMS) |
322 | test_communicator_basic-tcp \ | ||
323 | test_communicator_basic-quic \ | ||
324 | test_communicator_basic-udp \ | ||
325 | test_communicator_rekey-tcp \ | ||
326 | test_communicator_rekey-udp \ | ||
327 | test_communicator_backchannel-udp \ | ||
328 | test_communicator_bidirect-tcp | ||
329 | endif | 324 | endif |
330 | 325 | ||
331 | 326 | ||
diff --git a/src/service/transport/test_transport_start_testcase.sh b/src/service/transport/test_transport_start_testcase.sh index 028c8f248..ad9832fb8 100755 --- a/src/service/transport/test_transport_start_testcase.sh +++ b/src/service/transport/test_transport_start_testcase.sh | |||
@@ -1,12 +1,12 @@ | |||
1 | #!/bin/bash | 1 | #!/bin/bash |
2 | read -p "Test case configuration to use:" conf | 2 | #read -p "Test case configuration to use:" conf |
3 | if ! [ -d "/run/netns" ]; then | 3 | #if ! [ -d "/run/netns" ]; then |
4 | echo You have to create the directory /run/netns. | 4 | # echo You have to create the directory /run/netns. |
5 | fi | 5 | #fi |
6 | if [ -f /proc/sys/kernel/unprivileged_userns_clone ]; then | 6 | #if [ -f /proc/sys/kernel/unprivileged_userns_clone ]; then |
7 | if [ "$(cat /proc/sys/kernel/unprivileged_userns_clone)" != 1 ]; then | 7 | # if [ "$(cat /proc/sys/kernel/unprivileged_userns_clone)" != 1 ]; then |
8 | echo -e "Error during test setup: The kernel parameter kernel.unprivileged_userns_clone has to be set to 1! One has to execute\n\n sysctl kernel.unprivileged_userns_clone=1\n" | 8 | # echo -e "Error during test setup: The kernel parameter kernel.unprivileged_userns_clone has to be set to 1! One has to execute\n\n sysctl kernel.unprivileged_userns_clone=1\n" |
9 | exit 78 | 9 | # exit 78 |
10 | fi | 10 | # fi |
11 | fi | 11 | #fi |
12 | exec unshare -r -nmU bash -c "mount -t tmpfs --make-rshared tmpfs /run/netns; ./test_transport_start_with_config $conf" | 12 | #exec unshare -r -nmU bash -c "mount -t tmpfs --make-rshared tmpfs /run/netns; ./test_transport_start_with_config $conf" |