summaryrefslogtreecommitdiff
path: root/auto_tests
diff options
context:
space:
mode:
authoriphydf <iphydf@users.noreply.github.com>2020-02-29 16:01:08 +0000
committeriphydf <iphydf@users.noreply.github.com>2020-03-02 14:23:44 +0000
commit0f7138c01006b35f2b1b477c30ae66ec243c21e1 (patch)
treecad019aebb27d64675c5937b68dcb33acfd64c77 /auto_tests
parentf6c3ce6d1f23daec5d2e5d6e3c20408aba4c7e9c (diff)
Upgrade bazel to 2.1.1.
Removed av_test, because it depends on an ancient opencv that starts to really not exist on modern systems anymore.
Diffstat (limited to 'auto_tests')
-rw-r--r--auto_tests/BUILD.bazel14
-rw-r--r--auto_tests/Makefile.inc4
-rw-r--r--auto_tests/tcp_relay_test.c12
3 files changed, 18 insertions, 12 deletions
diff --git a/auto_tests/BUILD.bazel b/auto_tests/BUILD.bazel
index 23b948e5..5a1ae10e 100644
--- a/auto_tests/BUILD.bazel
+++ b/auto_tests/BUILD.bazel
@@ -26,14 +26,14 @@ flaky_tests = {
26 src[:-2], 26 src[:-2],
27 "small", 27 "small",
28 ), 28 ),
29 flaky = flaky_tests.get(
30 src[:-2],
31 False,
32 ),
33 srcs = [src], 29 srcs = [src],
34 args = ["$(location %s)" % src], 30 args = ["$(location %s)" % src],
35 copts = ["-Wno-sign-compare"], 31 copts = ["-Wno-sign-compare"],
36 data = glob(["data/*"]), 32 data = glob(["data/*"]),
33 flaky = flaky_tests.get(
34 src[:-2],
35 False,
36 ),
37 deps = [ 37 deps = [
38 ":check_compat", 38 ":check_compat",
39 ":run_auto_test", 39 ":run_auto_test",
@@ -43,4 +43,8 @@ flaky_tests = {
43 "//c-toxcore/toxcore:DHT_srcs", 43 "//c-toxcore/toxcore:DHT_srcs",
44 "//c-toxcore/toxencryptsave", 44 "//c-toxcore/toxencryptsave",
45 ], 45 ],
46) for src in glob(["*_test.c"])] 46) for src in glob(
47 ["*_test.c"],
48 # TODO(iphydf): Fix this test and re-enable it.
49 exclude = ["tcp_relay_test.c"],
50)]
diff --git a/auto_tests/Makefile.inc b/auto_tests/Makefile.inc
index 98f9db13..fcaeff5b 100644
--- a/auto_tests/Makefile.inc
+++ b/auto_tests/Makefile.inc
@@ -32,7 +32,6 @@ TESTS = \
32 set_name_test \ 32 set_name_test \
33 set_status_message_test \ 33 set_status_message_test \
34 skeleton_test \ 34 skeleton_test \
35 tcp_relay_test \
36 TCP_test \ 35 TCP_test \
37 tox_many_tcp_test \ 36 tox_many_tcp_test \
38 tox_many_test \ 37 tox_many_test \
@@ -41,6 +40,9 @@ TESTS = \
41 typing_test \ 40 typing_test \
42 version_test 41 version_test
43 42
43# TODO(iphydf): Fix this test and re-enable it.
44# tcp_relay_test
45
44AUTOTEST_CFLAGS = \ 46AUTOTEST_CFLAGS = \
45 $(LIBSODIUM_CFLAGS) \ 47 $(LIBSODIUM_CFLAGS) \
46 $(NACL_CFLAGS) 48 $(NACL_CFLAGS)
diff --git a/auto_tests/tcp_relay_test.c b/auto_tests/tcp_relay_test.c
index 7d821c20..b9eea92d 100644
--- a/auto_tests/tcp_relay_test.c
+++ b/auto_tests/tcp_relay_test.c
@@ -8,10 +8,10 @@
8#include "check_compat.h" 8#include "check_compat.h"
9 9
10static uint8_t const key[] = { 10static uint8_t const key[] = {
11 0x02, 0x80, 0x7C, 0xF4, 0xF8, 0xBB, 0x8F, 0xB3, 11 0x3F, 0x0A, 0x45, 0xA2, 0x68, 0x36, 0x7C, 0x1B,
12 0x90, 0xCC, 0x37, 0x94, 0xBD, 0xF1, 0xE8, 0x44, 12 0xEA, 0x65, 0x2F, 0x25, 0x8C, 0x85, 0xF4, 0xA6,
13 0x9E, 0x9A, 0x83, 0x92, 0xC5, 0xD3, 0xF2, 0x20, 13 0x6D, 0xA7, 0x6B, 0xCA, 0xA6, 0x67, 0xA4, 0x9E,
14 0x00, 0x19, 0xDA, 0x9F, 0x1E, 0x81, 0x2E, 0x46, 14 0x77, 0x0B, 0xCC, 0x49, 0x17, 0xAB, 0x6A, 0x25,
15}; 15};
16 16
17int main(void) 17int main(void)
@@ -23,8 +23,8 @@ int main(void)
23 Tox *tox_tcp = tox_new_log(opts, nullptr, nullptr); 23 Tox *tox_tcp = tox_new_log(opts, nullptr, nullptr);
24 tox_options_free(opts); 24 tox_options_free(opts);
25 25
26 tox_bootstrap(tox_tcp, "78.46.73.141", 33445, key, nullptr); 26 tox_bootstrap(tox_tcp, "tox.initramfs.io", 33445, key, nullptr);
27 tox_add_tcp_relay(tox_tcp, "78.46.73.141", 33445, key, nullptr); 27 tox_add_tcp_relay(tox_tcp, "tox.initramfs.io", 33445, key, nullptr);
28 28
29 printf("Waiting for connection"); 29 printf("Waiting for connection");
30 30