Separate run_auto_tests into a library

TokTok · Jan 25, 2022 · 1157e4e · 1157e4e
1 parent 5a88159
commit 1157e4e
Show file tree

Hide file tree

Showing 23 changed files with 814 additions and 726 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -71,6 +71,7 @@ jobs:
       - run: *apt_install
       - checkout
       - run: infer --no-progress-bar -- cc
+          auto_tests/auto_test_support.c
           auto_tests/lossless_packet_test.c
           testing/misc_tools.c
           toxav/*.c

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -106,6 +106,7 @@ jobs:
             -o send_message_test
             -Wall -Werror
             -bench -g
+            auto_tests/auto_test_support.c
             auto_tests/send_message_test.c
             testing/misc_tools.c
             toxav/*.c
@@ -117,6 +118,7 @@ jobs:
       - name: Build amalgamation file with TCC
         run:
           other/make_single_file
+            auto_tests/auto_test_support.c
             auto_tests/send_message_test.c
             testing/misc_tools.c |
           tcc -
@@ -141,6 +143,7 @@ jobs:
             -Wno-unknown-pragmas
             -Wno-unused-variable
             -fstruct-passing -fno-unprototyped -g
+            auto_tests/auto_test_support.c
             auto_tests/send_message_test.c
             testing/misc_tools.c
             toxav/*.c

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -391,11 +391,18 @@ endif()
 
 option(AUTOTEST "Enable autotests (mainly for CI)" OFF)
 
+if(AUTOTEST)
+  add_library(auto_test_support
+    auto_tests/auto_test_support.c
+    auto_tests/auto_test_support.h)
+  target_link_modules(auto_test_support 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 auto_test_support)
     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}")

diff --git a/auto_tests/BUILD.bazel b/auto_tests/BUILD.bazel
@@ -9,9 +9,17 @@ cc_library(
 )
 
 cc_library(
-    name = "run_auto_test",
+    name = "auto_test_support",
     testonly = True,
-    hdrs = ["run_auto_test.h"],
+    srcs = ["auto_test_support.c"],
+    hdrs = ["auto_test_support.h"],
+    deps = [
+        ":check_compat",
+        "//c-toxcore/testing:misc_tools",
+        "//c-toxcore/toxcore:Messenger",
+        "//c-toxcore/toxcore:mono_time",
+        "//c-toxcore/toxcore",
+    ],
 )
 
 flaky_tests = {
@@ -33,7 +41,7 @@ flaky_tests = {
     ),
     deps = [
         ":check_compat",
-        ":run_auto_test",
+        ":auto_test_support",
         "//c-toxcore/testing:misc_tools",
         "//c-toxcore/toxav",
         "//c-toxcore/toxcore",

diff --git a/auto_tests/Makefile.inc b/auto_tests/Makefile.inc
@@ -1,5 +1,9 @@
 if BUILD_TESTS
 
+noinst_LTLIBRARIES += libauto_test_support.la
+libauto_test_support_la_SOURCES = ../auto_tests/auto_test_support.c ../auto_tests/auto_test_support.h
+libauto_test_support_la_LIBADD = libmisc_tools.la libtoxcore.la
+
 TESTS = \
 	conference_double_invite_test \
 	conference_invite_merge_test \
@@ -51,6 +55,7 @@ AUTOTEST_LDADD = \
 	$(LIBSODIUM_LDFLAGS) \
 	$(NACL_LDFLAGS) \
 	libmisc_tools.la \
+	libauto_test_support.la \
 	libtoxcore.la \
 	libtoxencryptsave.la \
 	$(LIBSODIUM_LIBS) \
@@ -239,4 +244,4 @@ endif
 EXTRA_DIST += \
 	$(top_srcdir)/auto_tests/data/save.tox \
 	$(top_srcdir)/auto_tests/check_compat.h \
-	$(top_srcdir)/auto_tests/run_auto_test.h
+	$(top_srcdir)/auto_tests/auto_test_support.h