Merge c61ce99 into 8f4400b

CMakeLists.txt

@@ -393,11 +393,18 @@ endif()
 
 option(AUTOTEST "Enable autotests (mainly for CI)" OFF)
 
+if(AUTOTEST)
+  add_library(run_auto_test
+    auto_tests/run_auto_test.c
+    auto_tests/run_auto_test.h)
+  target_link_modules(run_auto_test toxcore misc_tools)
+endif()
+
 function(auto_test target)
   if(AUTOTEST AND NOT (MSVC AND ARGV1 STREQUAL "MSVC_DONT_BUILD"))
     add_executable(auto_${target}_test ${CPUFEATURES}
       auto_tests/${target}_test.c)
-    target_link_modules(auto_${target}_test toxcore misc_tools)
+    target_link_modules(auto_${target}_test toxcore misc_tools run_auto_test)
     if(NOT ARGV1 STREQUAL "DONT_RUN")
       add_test(NAME ${target} COMMAND ${CROSSCOMPILING_EMULATOR} auto_${target}_test)
       set_tests_properties(${target} PROPERTIES TIMEOUT "${TEST_TIMEOUT_SECONDS}")

auto_tests/BUILD.bazel

@@ -8,8 +8,13 @@ cc_library(
 
 cc_library(
     name = "run_auto_test",
-    testonly = True,
+    srcs = ["run_auto_test.c"],
     hdrs = ["run_auto_test.h"],
+    deps = [
+        ":check_compat",
+        "//c-toxcore/testing:misc_tools",
+        "//c-toxcore/toxcore",
+    ],
 )
 
 flaky_tests = {

auto_tests/Makefile.inc

@@ -1,5 +1,8 @@
 if BUILD_TESTS
 
+noinst_LTLIBRARIES += librun_auto_test.la
+librun_auto_test_la_SOURCES = ../auto_tests/run_auto_test.c ../auto_tests/run_auto_test.h
+
 TESTS = \
 	bootstrap_test \
 	conference_double_invite_test \
@@ -50,13 +53,13 @@ AUTOTEST_LDADD = \
 	$(LIBSODIUM_LDFLAGS) \
 	$(NACL_LDFLAGS) \
 	libmisc_tools.la \
+	librun_auto_test.la \
 	libtoxcore.la \
 	libtoxencryptsave.la \
 	$(LIBSODIUM_LIBS) \
 	$(NACL_OBJECTS) \
 	$(NACL_LIBS)
 
-
 if BUILD_AV
 TESTS += conference_av_test toxav_basic_test toxav_many_test
 AUTOTEST_LDADD += libtoxav.la