Add AUTOTEST Option to CMakeLists.txt

9 files changed, 16 insertions, 8 deletions

diff --git a/.circleci/cmake-asan b/.circleci/cmake-asan
index 2f9e99a8..5c381ee4 100755
--- a/.circleci/cmake-asan
+++ b/.circleci/cmake-asan
@@ -18,7 +18,8 @@ cmake -B_build -H. -GNinja			\
   -DMUST_BUILD_TOXAV=ON                         \
   -DSTRICT_ABI=ON                               \
   -DTEST_TIMEOUT_SECONDS=120                    \
-  -DUSE_IPV6=OFF
+  -DUSE_IPV6=OFF                                \
+  -DAUTOTEST=ON
 
 cd _build
 
diff --git a/.circleci/cmake-tsan b/.circleci/cmake-tsan
index 5d4453ff..31123dfa 100755
--- a/.circleci/cmake-tsan
+++ b/.circleci/cmake-tsan
@@ -18,7 +18,8 @@ cmake -H. -B_build -GNinja			\
   -DMUST_BUILD_TOXAV=ON                         \
   -DSTRICT_ABI=ON                               \
   -DTEST_TIMEOUT_SECONDS=120                    \
-  -DUSE_IPV6=OFF
+  -DUSE_IPV6=OFF                                \
+  -DAUTOTEST=ON
 
 cd _build
 
diff --git a/.travis/cmake-freebsd-stage2 b/.travis/cmake-freebsd-stage2
index cf09490c..9750531e 100755
--- a/.travis/cmake-freebsd-stage2
+++ b/.travis/cmake-freebsd-stage2
@@ -60,7 +60,8 @@ travis_script() {
     -DMUST_BUILD_TOXAV=ON \
     -DSTRICT_ABI=ON \
     -DTEST_TIMEOUT_SECONDS=120 \
-    -DUSE_IPV6=OFF'
+    -DUSE_IPV6=OFF \
+    -DAUTOTEST=ON'
 
   # We created the VM with the same number of cores as the host, so the host-ran `nproc` here is fine
   RUN 'gmake "-j$NPROC" -k install -C_build'
diff --git a/.travis/cmake-linux b/.travis/cmake-linux
index 5f8fcbde..3b34f474 100755
--- a/.travis/cmake-linux
+++ b/.travis/cmake-linux
@@ -97,7 +97,8 @@ travis_script() {
     -DMUST_BUILD_TOXAV=ON \
     -DSTRICT_ABI=ON \
     -DTEST_TIMEOUT_SECONDS=120 \
-    -DUSE_IPV6=OFF
+    -DUSE_IPV6=OFF \
+    -DAUTOTEST=ON
 
   cd _build  # pushd
   make "-j$NPROC" -k install
diff --git a/.travis/cmake-osx b/.travis/cmake-osx
index 9c5b8e10..b6526b15 100755
--- a/.travis/cmake-osx
+++ b/.travis/cmake-osx
@@ -31,7 +31,8 @@ travis_script() {
     -DMIN_LOGGER_LEVEL=TRACE \
     -DMUST_BUILD_TOXAV=ON \
     -DTEST_TIMEOUT_SECONDS=120 \
-    -DUSE_IPV6=OFF
+    -DUSE_IPV6=OFF \
+    -DAUTOTEST=ON
 
   cd _build  # pushd
   make "-j$NPROC" -k install
diff --git a/.travis/cmake-windows.sh b/.travis/cmake-windows.sh
index 80e37141..f22accc0 100644
--- a/.travis/cmake-windows.sh
+++ b/.travis/cmake-windows.sh
@@ -30,7 +30,7 @@ travis_script() {
     -e ENABLE_ARCH_i686=$i686 \
     -e ENABLE_ARCH_x86_64=$x86_64 \
     -e ENABLE_TEST=true \
-    -e EXTRA_CMAKE_FLAGS="-DBOOTSTRAP_DAEMON=OFF -DMIN_LOGGER_LEVEL=DEBUG -DTEST_TIMEOUT_SECONDS=90" \
+    -e EXTRA_CMAKE_FLAGS="-DBOOTSTRAP_DAEMON=OFF -DMIN_LOGGER_LEVEL=DEBUG -DTEST_TIMEOUT_SECONDS=90 -DAUTOTEST=ON" \
     -e DCMAKE_C_FLAGS="$C_FLAGS" \
     -e CMAKE_CXX_FLAGS="$CXX_FLAGS" \
     -e CMAKE_EXE_LINKER_FLAGS="$LD_FLAGS" \
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7142af5f..e7c0d79b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -389,8 +389,10 @@ if(ANDROID_CPU_FEATURES)
   set(CPUFEATURES other/cpufeatures.c)
 endif()
 
+option(AUTOTEST "Enable autotests (mainly for CI)" OFF)
+
 function(auto_test target)
-  if(NOT (MSVC AND ARGV1 STREQUAL "MSVC_DONT_BUILD"))
+  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)
diff --git a/INSTALL.md b/INSTALL.md
index 9ba73e33..5e5828ac 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -94,6 +94,7 @@ There are some options that are available to configure the build.
 | `STRICT_ABI`           | Enforce strict ABI export in dynamic libraries.                                               | ON or OFF                                                                 | OFF                                               |
 | `TEST_TIMEOUT_SECONDS` | Limit runtime of each test to the number of seconds specified.                                | Positive number or nothing (empty string).                                | Empty string.                                     |
 | `USE_IPV6`             | Use IPv6 in tests.                                                                            | ON or OFF                                                                 | ON                                                |
+| `AUTOTEST`             | Enable autotests (mainly for CI).                                                             | ON or OFF                                                                 | OFF                                               |
 
 You can get this list of option using the following commands
 
diff --git a/appveyor.yml b/appveyor.yml
index 1b5227e3..08505615 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -21,7 +21,7 @@ install:
   - cd ../..
 
 before_build:
-  - cmake -B_build -H. -DBOOTSTRAP_DAEMON=OFF -DENABLE_SHARED=OFF -DBUILD_TOXAV=OFF -DTEST_TIMEOUT_SECONDS=120
+  - cmake -B_build -H. -DBOOTSTRAP_DAEMON=OFF -DENABLE_SHARED=OFF -DBUILD_TOXAV=OFF -DTEST_TIMEOUT_SECONDS=120 -DAUTOTEST=ON
 
 build:
   project: _build/INSTALL.vcxproj