From 7c0eb5c70bea026eca665466b05213e7b21e3cba Mon Sep 17 00:00:00 2001
From: iphydf <iphydf@users.noreply.github.com>
Date: Mon, 20 Apr 2020 00:16:33 +0000
Subject: Enable TCP relay test in Bazel and autotools build.

This test was fixed by @robinlinden, but not enabled in all builds.
---
 .travis.yml             | 1 -
 auto_tests/BUILD.bazel  | 7 +------
 auto_tests/Makefile.inc | 4 +---
 other/fun/BUILD.bazel   | 2 +-
 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:
 
 cache:
   directories:
-    - $HOME/.cache/bazel
     - $HOME/cache
     - /opt/freebsd/cache
 
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(
 flaky_tests = {
     "crypto_core_test": True,
     "lan_discovery_test": True,
-    "tcp_relay_test": True,
 }
 
 [cc_test(
@@ -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"])]
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 = \
 	set_status_message_test \
 	skeleton_test \
 	TCP_test \
+	tcp_relay_test \
 	tox_many_tcp_test \
 	tox_many_test \
 	tox_one_test \
@@ -41,9 +42,6 @@ TESTS = \
 	typing_test \
 	version_test
 
-# TODO(iphydf): Fix this test and re-enable it.
-#	tcp_relay_test
-
 AUTOTEST_CFLAGS = \
 	$(LIBSODIUM_CFLAGS) \
 	$(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(
         "@libsodium",
     ],
 )
+
 cc_binary(
     name = "minimal-save-generator",
     srcs = ["minimal-save-generator.c"],
@@ -16,7 +17,6 @@ cc_binary(
     ],
 )
 
-
 cc_binary(
     name = "sign",
     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(
     srcs = [
         "tox.c",
         "tox.h",
-        "tox_private.h",
         "tox_api.c",
+        "tox_private.h",
     ],
     visibility = ["//c-toxcore:__subpackages__"],
     deps = [
-- 
cgit v1.2.3