summaryrefslogtreecommitdiff
path: root/auto_tests
diff options
context:
space:
mode:
authoriphydf <iphydf@users.noreply.github.com>2020-04-20 00:16:33 +0000
committeriphydf <iphydf@users.noreply.github.com>2020-04-20 09:28:00 +0000
commit7c0eb5c70bea026eca665466b05213e7b21e3cba (patch)
treeccdf4af92ba05b380e5dcb355240a4d646c01e9a /auto_tests
parent6ebcd365c92de93bb8fa12165db42eae6f487927 (diff)
Enable TCP relay test in Bazel and autotools build.
This test was fixed by @robinlinden, but not enabled in all builds.
Diffstat (limited to 'auto_tests')
-rw-r--r--auto_tests/BUILD.bazel7
-rw-r--r--auto_tests/Makefile.inc4
2 files changed, 2 insertions, 9 deletions
diff --git a/auto_tests/BUILD.bazel b/auto_tests/BUILD.bazel
index cce35b10..9e75a1c5 100644
--- a/auto_tests/BUILD.bazel
+++ b/auto_tests/BUILD.bazel
@@ -15,7 +15,6 @@ cc_library(
15flaky_tests = { 15flaky_tests = {
16 "crypto_core_test": True, 16 "crypto_core_test": True,
17 "lan_discovery_test": True, 17 "lan_discovery_test": True,
18 "tcp_relay_test": True,
19} 18}
20 19
21[cc_test( 20[cc_test(
@@ -37,8 +36,4 @@ flaky_tests = {
37 "//c-toxcore/toxcore:DHT_srcs", 36 "//c-toxcore/toxcore:DHT_srcs",
38 "//c-toxcore/toxencryptsave", 37 "//c-toxcore/toxencryptsave",
39 ], 38 ],
40) for src in glob( 39) for src in glob(["*_test.c"])]
41 ["*_test.c"],
42 # TODO(iphydf): Fix this test and re-enable it.
43 exclude = ["tcp_relay_test.c"],
44)]
diff --git a/auto_tests/Makefile.inc b/auto_tests/Makefile.inc
index 983c83d3..8a22243e 100644
--- a/auto_tests/Makefile.inc
+++ b/auto_tests/Makefile.inc
@@ -34,6 +34,7 @@ TESTS = \
34 set_status_message_test \ 34 set_status_message_test \
35 skeleton_test \ 35 skeleton_test \
36 TCP_test \ 36 TCP_test \
37 tcp_relay_test \
37 tox_many_tcp_test \ 38 tox_many_tcp_test \
38 tox_many_test \ 39 tox_many_test \
39 tox_one_test \ 40 tox_one_test \
@@ -41,9 +42,6 @@ TESTS = \
41 typing_test \ 42 typing_test \
42 version_test 43 version_test
43 44
44# TODO(iphydf): Fix this test and re-enable it.
45# tcp_relay_test
46
47AUTOTEST_CFLAGS = \ 45AUTOTEST_CFLAGS = \
48 $(LIBSODIUM_CFLAGS) \ 46 $(LIBSODIUM_CFLAGS) \
49 $(NACL_CFLAGS) 47 $(NACL_CFLAGS)