Disable non-hermetic tests by default.

See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=955319.

6 files changed, 13 insertions, 3 deletions

diff --git a/.circleci/cmake-asan b/.circleci/cmake-asan
index 0d796aba..cc1434b1 100755
--- a/.circleci/cmake-asan
+++ b/.circleci/cmake-asan
@@ -17,6 +17,7 @@ cmake -B_build -H. -GNinja			\
   -DCMAKE_INSTALL_PREFIX:PATH="$PWD/_install"   \
   -DMIN_LOGGER_LEVEL=TRACE                      \
   -DMUST_BUILD_TOXAV=ON                         \
+  -DNON_HERMETIC_TESTS=ON                       \
   -DSTRICT_ABI=ON                               \
   -DTEST_TIMEOUT_SECONDS=120                    \
   -DUSE_IPV6=OFF                                \
diff --git a/.circleci/cmake-tsan b/.circleci/cmake-tsan
index b351e534..b42e8f18 100755
--- a/.circleci/cmake-tsan
+++ b/.circleci/cmake-tsan
@@ -9,7 +9,7 @@ add_flag -Werror
 add_flag -fdiagnostics-color=always
 add_flag -fno-omit-frame-pointer
 add_flag -fsanitize=thread
-cmake -H. -B_build -GNinja                      \
+cmake -B_build -H. -GNinja                      \
   -DCMAKE_C_FLAGS="$C_FLAGS"                    \
   -DCMAKE_CXX_FLAGS="$CXX_FLAGS"                \
   -DCMAKE_EXE_LINKER_FLAGS="$LD_FLAGS"          \
@@ -17,6 +17,7 @@ cmake -H. -B_build -GNinja			\
   -DCMAKE_INSTALL_PREFIX:PATH="$PWD/_install"   \
   -DMIN_LOGGER_LEVEL=TRACE                      \
   -DMUST_BUILD_TOXAV=ON                         \
+  -DNON_HERMETIC_TESTS=ON                       \
   -DSTRICT_ABI=ON                               \
   -DTEST_TIMEOUT_SECONDS=120                    \
   -DUSE_IPV6=OFF                                \
diff --git a/.travis/cmake-freebsd-stage2 b/.travis/cmake-freebsd-stage2
index 609cd618..98090ba1 100755
--- a/.travis/cmake-freebsd-stage2
+++ b/.travis/cmake-freebsd-stage2
@@ -57,6 +57,7 @@ travis_script() {
     -DCMAKE_INSTALL_PREFIX:PATH="_install" \
     -DMIN_LOGGER_LEVEL=TRACE \
     -DMUST_BUILD_TOXAV=ON \
+    -DNON_HERMETIC_TESTS=ON \
     -DSTRICT_ABI=ON \
     -DTEST_TIMEOUT_SECONDS=300 \
     -DUSE_IPV6=OFF \
diff --git a/.travis/cmake-linux b/.travis/cmake-linux
index e2f44195..ed06dc26 100755
--- a/.travis/cmake-linux
+++ b/.travis/cmake-linux
@@ -77,6 +77,7 @@ travis_script() {
     -DCMAKE_INSTALL_PREFIX:PATH="$PWD/_install" \
     -DMIN_LOGGER_LEVEL=TRACE \
     -DMUST_BUILD_TOXAV=ON \
+    -DNON_HERMETIC_TESTS=ON \
     -DSTRICT_ABI=ON \
     -DTEST_TIMEOUT_SECONDS=120 \
     -DUSE_IPV6=OFF \
diff --git a/.travis/cmake-osx b/.travis/cmake-osx
index b6526b15..cb12301d 100755
--- a/.travis/cmake-osx
+++ b/.travis/cmake-osx
@@ -30,6 +30,7 @@ travis_script() {
     -DCMAKE_INSTALL_PREFIX:PATH="$PWD/_install" \
     -DMIN_LOGGER_LEVEL=TRACE \
     -DMUST_BUILD_TOXAV=ON \
+    -DNON_HERMETIC_TESTS=ON \
     -DTEST_TIMEOUT_SECONDS=120 \
     -DUSE_IPV6=OFF \
     -DAUTOTEST=ON
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 73f66cf1..8417715b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -110,6 +110,8 @@ if(USE_STDERR_LOGGER)
   add_definitions(-DUSE_STDERR_LOGGER=1)
 endif()
 
+option(NON_HERMETIC_TESTS "Whether to build and run tests that depend on an internet connection" OFF)
+
 option(BUILD_TOXAV "Whether to build the tox AV library" ON)
 option(MUST_BUILD_TOXAV "Fail the build if toxav cannot be built" OFF)
 
@@ -405,7 +407,6 @@ function(auto_test target)
 endfunction()
 
 auto_test(TCP)
-auto_test(bootstrap)
 auto_test(conference)
 auto_test(conference_double_invite)
 auto_test(conference_invite_merge)
@@ -436,7 +437,6 @@ auto_test(send_message)
 auto_test(set_name)
 auto_test(set_status_message)
 auto_test(skeleton)
-auto_test(tcp_relay)
 auto_test(tox_many)
 auto_test(tox_many_tcp)
 auto_test(tox_one)
@@ -445,6 +445,11 @@ auto_test(typing)
 auto_test(version)
 auto_test(save_compatibility)
 
+if(NON_HERMETIC_TESTS)
+  auto_test(bootstrap)
+  auto_test(tcp_relay)
+endif()
+
 if(BUILD_TOXAV)
   auto_test(conference_av)
   auto_test(toxav_basic)