diff options
author | iphydf <iphydf@users.noreply.github.com> | 2020-04-20 00:16:33 +0000 |
---|---|---|
committer | iphydf <iphydf@users.noreply.github.com> | 2020-04-20 09:28:00 +0000 |
commit | 7c0eb5c70bea026eca665466b05213e7b21e3cba (patch) | |
tree | ccdf4af92ba05b380e5dcb355240a4d646c01e9a | |
parent | 6ebcd365c92de93bb8fa12165db42eae6f487927 (diff) |
Enable TCP relay test in Bazel and autotools build.
This test was fixed by @robinlinden, but not enabled in all builds.
-rw-r--r-- | .travis.yml | 1 | ||||
-rw-r--r-- | auto_tests/BUILD.bazel | 7 | ||||
-rw-r--r-- | auto_tests/Makefile.inc | 4 | ||||
-rw-r--r-- | other/fun/BUILD.bazel | 2 | ||||
-rw-r--r-- | toxcore/BUILD.bazel | 2 |
5 files changed, 4 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index f8cf6c45..bfebbd71 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -75,7 +75,6 @@ jobs: | |||
75 | 75 | ||
76 | cache: | 76 | cache: |
77 | directories: | 77 | directories: |
78 | - $HOME/.cache/bazel | ||
79 | - $HOME/cache | 78 | - $HOME/cache |
80 | - /opt/freebsd/cache | 79 | - /opt/freebsd/cache |
81 | 80 | ||
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( | |||
15 | flaky_tests = { | 15 | flaky_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 | |||
47 | AUTOTEST_CFLAGS = \ | 45 | AUTOTEST_CFLAGS = \ |
48 | $(LIBSODIUM_CFLAGS) \ | 46 | $(LIBSODIUM_CFLAGS) \ |
49 | $(NACL_CFLAGS) | 47 | $(NACL_CFLAGS) |
diff --git a/other/fun/BUILD.bazel b/other/fun/BUILD.bazel index ae4cfb2f..33cb2c05 100644 --- a/other/fun/BUILD.bazel +++ b/other/fun/BUILD.bazel | |||
@@ -8,6 +8,7 @@ cc_binary( | |||
8 | "@libsodium", | 8 | "@libsodium", |
9 | ], | 9 | ], |
10 | ) | 10 | ) |
11 | |||
11 | cc_binary( | 12 | cc_binary( |
12 | name = "minimal-save-generator", | 13 | name = "minimal-save-generator", |
13 | srcs = ["minimal-save-generator.c"], | 14 | srcs = ["minimal-save-generator.c"], |
@@ -16,7 +17,6 @@ cc_binary( | |||
16 | ], | 17 | ], |
17 | ) | 18 | ) |
18 | 19 | ||
19 | |||
20 | cc_binary( | 20 | cc_binary( |
21 | name = "sign", | 21 | name = "sign", |
22 | srcs = ["sign.c"], | 22 | srcs = ["sign.c"], |
diff --git a/toxcore/BUILD.bazel b/toxcore/BUILD.bazel index d8d86d56..af23a2b2 100644 --- a/toxcore/BUILD.bazel +++ b/toxcore/BUILD.bazel | |||
@@ -272,8 +272,8 @@ cc_library( | |||
272 | srcs = [ | 272 | srcs = [ |
273 | "tox.c", | 273 | "tox.c", |
274 | "tox.h", | 274 | "tox.h", |
275 | "tox_private.h", | ||
276 | "tox_api.c", | 275 | "tox_api.c", |
276 | "tox_private.h", | ||
277 | ], | 277 | ], |
278 | visibility = ["//c-toxcore:__subpackages__"], | 278 | visibility = ["//c-toxcore:__subpackages__"], |
279 | deps = [ | 279 | deps = [ |