Skip to content

Commit

Permalink
Enable TCP relay test in Bazel and autotools build.
Browse files Browse the repository at this point in the history
This test was fixed by @robinlinden, but not enabled in all builds.
  • Loading branch information
iphydf committed Apr 20, 2020
1 parent 6ebcd36 commit 7c0eb5c
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 12 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ jobs:

cache:
directories:
- $HOME/.cache/bazel
- $HOME/cache
- /opt/freebsd/cache

Expand Down
7 changes: 1 addition & 6 deletions auto_tests/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ cc_library(
flaky_tests = {
"crypto_core_test": True,
"lan_discovery_test": True,
"tcp_relay_test": True,
}

[cc_test(
Expand All @@ -37,8 +36,4 @@ flaky_tests = {
"//c-toxcore/toxcore:DHT_srcs",
"//c-toxcore/toxencryptsave",
],
) for src in glob(
["*_test.c"],
# TODO(iphydf): Fix this test and re-enable it.
exclude = ["tcp_relay_test.c"],
)]
) for src in glob(["*_test.c"])]
4 changes: 1 addition & 3 deletions auto_tests/Makefile.inc
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,14 @@ TESTS = \
set_status_message_test \
skeleton_test \
TCP_test \
tcp_relay_test \
tox_many_tcp_test \
tox_many_test \
tox_one_test \
tox_strncasecmp_test \
typing_test \
version_test

# TODO(iphydf): Fix this test and re-enable it.
# tcp_relay_test

AUTOTEST_CFLAGS = \
$(LIBSODIUM_CFLAGS) \
$(NACL_CFLAGS)
Expand Down
2 changes: 1 addition & 1 deletion other/fun/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ cc_binary(
"@libsodium",
],
)

cc_binary(
name = "minimal-save-generator",
srcs = ["minimal-save-generator.c"],
Expand All @@ -16,7 +17,6 @@ cc_binary(
],
)


cc_binary(
name = "sign",
srcs = ["sign.c"],
Expand Down
2 changes: 1 addition & 1 deletion toxcore/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,8 @@ cc_library(
srcs = [
"tox.c",
"tox.h",
"tox_private.h",
"tox_api.c",
"tox_private.h",
],
visibility = ["//c-toxcore:__subpackages__"],
deps = [
Expand Down

0 comments on commit 7c0eb5c

Please sign in to comment.