13 files changed, 103 insertions, 75 deletions

diff --git a/auto_tests/BUILD.bazel b/auto_tests/BUILD.bazel
index ea3682b8..88951f97 100644
--- a/auto_tests/BUILD.bazel
+++ b/auto_tests/BUILD.bazel
@@ -22,7 +22,6 @@ cc_library(
         "//c-toxcore/toxav",
         "//c-toxcore/toxcore",
         "//c-toxcore/toxencryptsave",
-        "@check",
     ],
 ) for src in glob(["*_test.c"])]
 
@@ -47,6 +46,5 @@ cc_test(
         ":monolith",
         "//c-toxcore/other:monolith",
         "//c-toxcore/testing:misc_tools",
-        "@check",
     ],
 )
diff --git a/auto_tests/Makefile.inc b/auto_tests/Makefile.inc
index 536b08c5..6957262a 100644
--- a/auto_tests/Makefile.inc
+++ b/auto_tests/Makefile.inc
@@ -5,8 +5,7 @@ check_PROGRAMS = encryptsave_test messenger_autotest crypto_test network_test on
 
 AUTOTEST_CFLAGS = \
                          $(LIBSODIUM_CFLAGS) \
-                         $(NACL_CFLAGS) \
-                         $(CHECK_CFLAGS)
+                         $(NACL_CFLAGS)
 
 AUTOTEST_LDADD = \
                         $(LIBSODIUM_LDFLAGS) \
@@ -15,8 +14,7 @@ AUTOTEST_LDADD = \
                         libtoxencryptsave.la \
                         $(LIBSODIUM_LIBS) \
                         $(NACL_OBJECTS) \
-                        $(NACL_LIBS) \
-                        $(CHECK_LIBS)
+                        $(NACL_LIBS)
 
 
 
diff --git a/auto_tests/check_compat.h b/auto_tests/check_compat.h
index e4fde89f..755dea81 100644
--- a/auto_tests/check_compat.h
+++ b/auto_tests/check_compat.h
@@ -1,8 +1,66 @@
-#ifdef _MSC_VER
-#define pid_t int
-// #include <libcompat.h>
-#endif
-#include <check.h>
-#ifdef _MSC_VER
-#undef pid_t
-#endif
+#ifndef CHECK_COMPAT_H
+#define CHECK_COMPAT_H
+
+#include "../toxcore/ccompat.h"
+
+#include <stdbool.h>
+#include <stdio.h>
+
+#define START_TEST(name) static void name(void)
+#define END_TEST
+
+#define DEFTESTCASE(NAME) test_##NAME()
+#define DEFTESTCASE_SLOW(NAME, TIMEOUT) test_##NAME()
+
+typedef struct Suite Suite;
+typedef struct SRunner SRunner;
+enum SRunMode { CK_NORMAL };
+
+Suite *suite_create(const char *title)
+{
+    printf("Running test suite: %s\n", title);
+    return nullptr;
+}
+
+SRunner *srunner_create(Suite *s)
+{
+    return nullptr;
+}
+
+void srunner_free(SRunner *s)
+{
+}
+
+void srunner_run_all(SRunner *r, int mode)
+{
+}
+
+int srunner_ntests_failed(SRunner *r)
+{
+    return 0;
+}
+
+#define ck_assert(ok) do {                                              \
+  if (!(ok)) {                                                          \
+    fprintf(stderr, "%s:%d: failed `%s'\n", __FILE__, __LINE__, #ok);   \
+    exit(EXIT_FAILURE);                                                 \
+  }                                                                     \
+} while (0)
+
+#define ck_assert_msg(ok, ...) do {                                     \
+  if (!(ok)) {                                                          \
+    fprintf(stderr, "%s:%d: failed `%s': ", __FILE__, __LINE__, #ok);   \
+    fprintf(stderr, __VA_ARGS__);                                       \
+    fprintf(stderr, "\n");                                              \
+    exit(EXIT_FAILURE);                                                 \
+  }                                                                     \
+} while (0)
+
+#define ck_abort_msg(...) do {                                          \
+  fprintf(stderr, "%s:%d: ", __FILE__, __LINE__);                       \
+  fprintf(stderr, __VA_ARGS__);                                         \
+  fprintf(stderr, "\n");                                                \
+  exit(EXIT_FAILURE);                                                   \
+} while (0)
+
+#endif // CHECK_COMPAT_H
diff --git a/auto_tests/dht_test.c b/auto_tests/dht_test.c
index 227b43f7..8e735dbd 100644
--- a/auto_tests/dht_test.c
+++ b/auto_tests/dht_test.c
@@ -684,7 +684,7 @@ START_TEST(test_dht_create_packet)
     ck_assert_msg(pkt[0] == NET_PACKET_GET_NODES, "Malformed packet.");
     ck_assert_msg(memcmp(pkt + 1, key, CRYPTO_SYMMETRIC_KEY_SIZE) == 0, "Malformed packet.");
     ck_assert_msg(length == 1 + CRYPTO_PUBLIC_KEY_SIZE + CRYPTO_NONCE_SIZE + sizeof(plain) + CRYPTO_MAC_SIZE,
-                  "Invalid size. Should be %d got %d", sizeof(pkt), length);
+                  "Invalid size. Should be %u got %d", (unsigned)sizeof(pkt), length);
 
     printf("Create Packet Successful!\n");
 }
diff --git a/auto_tests/helpers.h b/auto_tests/helpers.h
index 7b6146a4..ac58684d 100644
--- a/auto_tests/helpers.h
+++ b/auto_tests/helpers.h
@@ -17,15 +17,6 @@
 #define c_sleep(x) usleep(1000 * (x))
 #endif
 
-#define DEFTESTCASE(NAME)                   \
-    TCase *tc_##NAME = tcase_create(#NAME); \
-    tcase_add_test(tc_##NAME, test_##NAME); \
-    suite_add_tcase(s, tc_##NAME)
-
-#define DEFTESTCASE_SLOW(NAME, TIMEOUT)     \
-    DEFTESTCASE(NAME);                      \
-    tcase_set_timeout(tc_##NAME, TIMEOUT)
-
 static const char *tox_log_level_name(TOX_LOG_LEVEL level)
 {
     switch (level) {
diff --git a/auto_tests/messenger_test.c b/auto_tests/messenger_test.c
index 34de6543..de5aa7dd 100644
--- a/auto_tests/messenger_test.c
+++ b/auto_tests/messenger_test.c
@@ -249,8 +249,8 @@ START_TEST(test_dht_state_saveloadsave)
     DHT_save(m->dht, buffer + extra);
 
     for (i = 0; i < extra; i++) {
-        ck_assert_msg(buffer[i] == 0xCD, "Buffer underwritten from DHT_save() @%u", i);
-        ck_assert_msg(buffer[extra + size + i] == 0xCD, "Buffer overwritten from DHT_save() @%u", i);
+        ck_assert_msg(buffer[i] == 0xCD, "Buffer underwritten from DHT_save() @%u", (unsigned)i);
+        ck_assert_msg(buffer[extra + size + i] == 0xCD, "Buffer overwritten from DHT_save() @%u", (unsigned)i);
     }
 
     int res = DHT_load(m->dht, buffer + extra, size);
@@ -263,11 +263,12 @@ START_TEST(test_dht_state_saveloadsave)
         uint8_t *ptr = buffer + extra + offset;
         sprintf(msg, "Failed to load back stored buffer: 0x%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx @%zu/%zu, code %d",
                 ptr[-2], ptr[-1], ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], offset, size, res & 0x0F);
-        ck_assert_msg(res == 0, msg);
+        ck_assert_msg(res == 0, "%s", msg);
     }
 
     size_t size2 = DHT_size(m->dht);
-    ck_assert_msg(size == size2, "Messenger \"grew\" in size from a store/load cycle: %u -> %u", size, size2);
+    ck_assert_msg(size == size2, "Messenger \"grew\" in size from a store/load cycle: %u -> %u", (unsigned)size,
+                  (unsigned)size2);
 
     VLA(uint8_t, buffer2, size2);
     DHT_save(m->dht, buffer2);
@@ -291,8 +292,8 @@ START_TEST(test_messenger_state_saveloadsave)
     messenger_save(m, buffer + extra);
 
     for (i = 0; i < extra; i++) {
-        ck_assert_msg(buffer[i] == 0xCD, "Buffer underwritten from messenger_save() @%u", i);
-        ck_assert_msg(buffer[extra + size + i] == 0xCD, "Buffer overwritten from messenger_save() @%u", i);
+        ck_assert_msg(buffer[i] == 0xCD, "Buffer underwritten from messenger_save() @%u", (unsigned)i);
+        ck_assert_msg(buffer[extra + size + i] == 0xCD, "Buffer overwritten from messenger_save() @%u", (unsigned)i);
     }
 
     int res = messenger_load(m, buffer + extra, size);
@@ -305,11 +306,12 @@ START_TEST(test_messenger_state_saveloadsave)
         uint8_t *ptr = buffer + extra + offset;
         sprintf(msg, "Failed to load back stored buffer: 0x%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx @%zu/%zu, code %d",
                 ptr[-2], ptr[-1], ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], offset, size, res & 0x0F);
-        ck_assert_msg(res == 0, msg);
+        ck_assert_msg(res == 0, "%s", msg);
     }
 
     size_t size2 = messenger_size(m);
-    ck_assert_msg(size == size2, "Messenger \"grew\" in size from a store/load cycle: %u -> %u", size, size2);
+    ck_assert_msg(size == size2, "Messenger \"grew\" in size from a store/load cycle: %u -> %u",
+                  (unsigned)size, (unsigned)size2);
 
     VLA(uint8_t, buffer2, size2);
     messenger_save(m, buffer2);
@@ -346,10 +348,6 @@ static Suite *messenger_suite(void)
 
 int main(int argc, char *argv[])
 {
-    Suite *messenger = messenger_suite();
-    SRunner *test_runner = srunner_create(messenger);
-    int number_failed = 0;
-
     friend_id = hex_string_to_bin(friend_id_str);
     good_id_a = hex_string_to_bin(good_id_a_str);
     good_id_b = hex_string_to_bin(good_id_b_str);
@@ -374,6 +372,10 @@ int main(int argc, char *argv[])
               "the tests will continue now...\n\n", stderr);
     }
 
+    Suite *messenger = messenger_suite();
+    SRunner *test_runner = srunner_create(messenger);
+    int number_failed = 0;
+
     srunner_run_all(test_runner, CK_NORMAL);
     number_failed = srunner_ntests_failed(test_runner);
 
diff --git a/auto_tests/network_test.c b/auto_tests/network_test.c
index 9e3e0e15..1885c81f 100644
--- a/auto_tests/network_test.c
+++ b/auto_tests/network_test.c
@@ -38,7 +38,7 @@ START_TEST(test_addr_resolv_localhost)
 
     int res = addr_resolve(localhost, &ip, nullptr);
 
-    ck_assert_msg(res > 0, "Resolver failed: %u, %s (%x, %x)", errno, strerror(errno));
+    ck_assert_msg(res > 0, "Resolver failed: %u, %s", errno, strerror(errno));
 
     char ip_str[IP_NTOA_LEN];
     ck_assert_msg(ip.family == TOX_AF_INET, "Expected family TOX_AF_INET, got %u.", ip.family);
@@ -54,7 +54,7 @@ START_TEST(test_addr_resolv_localhost)
         localhost_split = 1;
     }
 
-    ck_assert_msg(res > 0, "Resolver failed: %u, %s (%x, %x)", errno, strerror(errno));
+    ck_assert_msg(res > 0, "Resolver failed: %u, %s", errno, strerror(errno));
 
     ck_assert_msg(ip.family == TOX_AF_INET6, "Expected family TOX_AF_INET6 (%u), got %u.", TOX_AF_INET6, ip.family);
     IP6 ip6_loopback = get_ip6_loopback();
@@ -71,7 +71,7 @@ START_TEST(test_addr_resolv_localhost)
     IP extra;
     ip_reset(&extra);
     res = addr_resolve(localhost, &ip, &extra);
-    ck_assert_msg(res > 0, "Resolver failed: %u, %s (%x, %x)", errno, strerror(errno));
+    ck_assert_msg(res > 0, "Resolver failed: %u, %s", errno, strerror(errno));
 
 #if USE_IPV6
     ck_assert_msg(ip.family == TOX_AF_INET6, "Expected family TOX_AF_INET6 (%u), got %u.", TOX_AF_INET6, ip.family);
@@ -149,7 +149,7 @@ START_TEST(test_ip_equal)
 
     ip2.ip6.uint8[15]++;
     res = ip_equal(&ip1, &ip2);
-    ck_assert_msg(res == 0, "ip_equal( {TOX_AF_INET6, ::1}, {TOX_AF_INET6, ::2} ): expected result 0, got %res.", res);
+    ck_assert_msg(res == 0, "ip_equal( {TOX_AF_INET6, ::1}, {TOX_AF_INET6, ::2} ): expected result 0, got %u.", res);
 }
 END_TEST
 
diff --git a/auto_tests/onion_test.c b/auto_tests/onion_test.c
index bf764f67..5989df17 100644
--- a/auto_tests/onion_test.c
+++ b/auto_tests/onion_test.c
@@ -449,7 +449,7 @@ START_TEST(test_announce)
 
     for (i = 0; i < NUM_ONIONS; ++i) {
         onions[i] = new_onions(i + 34655);
-        ck_assert_msg(onions[i] != nullptr, "Failed to create onions. %u");
+        ck_assert_msg(onions[i] != nullptr, "Failed to create onions. %u", i);
     }
 
     IP ip = get_loopback();
diff --git a/auto_tests/tox_many_tcp_test.c b/auto_tests/tox_many_tcp_test.c
index 81e6244a..e4309db7 100644
--- a/auto_tests/tox_many_tcp_test.c
+++ b/auto_tests/tox_many_tcp_test.c
@@ -259,21 +259,15 @@ loop_top:
 END_TEST
 
 
-#ifdef TRAVIS_ENV
-static const uint8_t timeout_mux = 20;
-#else
-static const uint8_t timeout_mux = 10;
-#endif
-
 static Suite *tox_suite(void)
 {
     Suite *s = suite_create("Tox many tcp");
 
     /* Each tox connects to a single tox TCP    */
-    DEFTESTCASE_SLOW(many_clients_tcp, 4 * timeout_mux);
+    DEFTESTCASE(many_clients_tcp);
 
     /* Try to make a connection to each "older sibling" tox instance via TCP */
-    DEFTESTCASE_SLOW(many_clients_tcp_b, 8 * timeout_mux);
+    DEFTESTCASE(many_clients_tcp_b);
 
     return s;
 }
diff --git a/auto_tests/tox_many_test.c b/auto_tests/tox_many_test.c
index 3d3aad6d..bacaaff8 100644
--- a/auto_tests/tox_many_test.c
+++ b/auto_tests/tox_many_test.c
@@ -139,17 +139,11 @@ loop_top:
 }
 END_TEST
 
-#ifdef TRAVIS_ENV
-static const uint8_t timeout_mux = 20;
-#else
-static const uint8_t timeout_mux = 10;
-#endif
-
 static Suite *tox_suite(void)
 {
     Suite *s = suite_create("Tox");
 
-    DEFTESTCASE_SLOW(many_clients, 8 * timeout_mux);
+    DEFTESTCASE(many_clients);
 
     return s;
 }
diff --git a/auto_tests/tox_strncasecmp_test.c b/auto_tests/tox_strncasecmp_test.c
index 3a544c00..fc0d2fc8 100644
--- a/auto_tests/tox_strncasecmp_test.c
+++ b/auto_tests/tox_strncasecmp_test.c
@@ -29,7 +29,7 @@ void verify(const char *s1, const char *s2, size_t n, Comparison expected)
 
     ck_assert_msg(actual == expected,
                   "tox_strncasecmp(\"%s\", \"%s\", %u) == %s, but expected %s.",
-                  s1, s2, n, Comparison_Str[actual], Comparison_Str[expected]);
+                  s1, s2, (unsigned)n, Comparison_Str[actual], Comparison_Str[expected]);
 }
 
 START_TEST(test_general)
diff --git a/auto_tests/tox_test.c b/auto_tests/tox_test.c
index be6da1d4..82c18b37 100644
--- a/auto_tests/tox_test.c
+++ b/auto_tests/tox_test.c
@@ -234,7 +234,7 @@ static void tox_file_chunk_request(Tox *tox, uint32_t friend_number, uint32_t fi
     }
 
     if (sending_pos != position) {
-        ck_abort_msg("Bad position %llu", position);
+        ck_abort_msg("Bad position %llu", (unsigned long long)position);
     }
 
     if (length == 0) {
@@ -614,8 +614,9 @@ START_TEST(test_few_clients)
             }
 
             ck_abort_msg("Something went wrong in file transfer %u %u %u %u %u %u %llu %llu %llu", sendf_ok, file_recv,
-                         totalf_size == file_size, size_recv == file_size, sending_pos == size_recv, file_accepted == 1, totalf_size, size_recv,
-                         sending_pos);
+                         totalf_size == file_size, size_recv == file_size, sending_pos == size_recv, file_accepted == 1,
+                         (unsigned long long)totalf_size, (unsigned long long)size_recv,
+                         (unsigned long long)sending_pos);
         }
 
         uint32_t tox1_interval = tox_iteration_interval(tox1);
@@ -664,8 +665,8 @@ START_TEST(test_few_clients)
 
             ck_abort_msg("Something went wrong in file transfer %u %u %u %u %u %u %u %llu %llu %llu %llu", sendf_ok, file_recv,
                          m_send_reached, totalf_size == file_size, size_recv == max_sending, sending_pos == size_recv, file_accepted == 1,
-                         totalf_size, file_size,
-                         size_recv, sending_pos);
+                         (unsigned long long)totalf_size, (unsigned long long)file_size,
+                         (unsigned long long)size_recv, (unsigned long long)sending_pos);
         }
 
         uint32_t tox1_interval = tox_iteration_interval(tox1);
@@ -708,8 +709,9 @@ START_TEST(test_few_clients)
             }
 
             ck_abort_msg("Something went wrong in file transfer %u %u %u %u %u %u %llu %llu %llu", sendf_ok, file_recv,
-                         totalf_size == file_size, size_recv == file_size, sending_pos == size_recv, file_accepted == 1, totalf_size, size_recv,
-                         sending_pos);
+                         totalf_size == file_size, size_recv == file_size, sending_pos == size_recv, file_accepted == 1,
+                         (unsigned long long)totalf_size, (unsigned long long)size_recv,
+                         (unsigned long long)sending_pos);
         }
 
         uint32_t tox1_interval = tox_iteration_interval(tox1);
@@ -728,17 +730,11 @@ START_TEST(test_few_clients)
 }
 END_TEST
 
-#ifdef TRAVIS_ENV
-static const uint8_t timeout_mux = 20;
-#else
-static const uint8_t timeout_mux = 10;
-#endif
-
 static Suite *tox_suite(void)
 {
     Suite *s = suite_create("Tox few clients");
 
-    DEFTESTCASE_SLOW(few_clients, 8 * timeout_mux);
+    DEFTESTCASE(few_clients);
 
     return s;
 }
diff --git a/auto_tests/toxav_many_test.c b/auto_tests/toxav_many_test.c
index 9a639eb8..02215098 100644
--- a/auto_tests/toxav_many_test.c
+++ b/auto_tests/toxav_many_test.c
@@ -341,10 +341,7 @@ static Suite *tox_suite(void)
 {
     Suite *s = suite_create("ToxAV");
 
-    TCase *tc_av_three_calls = tcase_create("AV_three_calls");
-    tcase_add_test(tc_av_three_calls, test_AV_three_calls);
-    tcase_set_timeout(tc_av_three_calls, 150);
-    suite_add_tcase(s, tc_av_three_calls);
+    DEFTESTCASE(AV_three_calls);
 
     return s;
 }