summaryrefslogtreecommitdiff
path: root/other
diff options
context:
space:
mode:
authoriphydf <iphydf@users.noreply.github.com>2018-06-25 15:13:15 +0000
committeriphydf <iphydf@users.noreply.github.com>2018-06-25 19:48:11 +0000
commitd22332dd505b5a269d379863a091d74522fce27b (patch)
tree8099f079ff87e245f8a0765e5d554253d38bf397 /other
parent7684b5ae3eaabec8fac035752fff30c651109dfc (diff)
Remove the format test.
It's annoying to have a test touch every source file. It causes a recompile of everything after every test run.
Diffstat (limited to 'other')
-rw-r--r--other/travis/env-linux.sh1
-rwxr-xr-xother/travis/toxcore-script2
2 files changed, 2 insertions, 1 deletions
diff --git a/other/travis/env-linux.sh b/other/travis/env-linux.sh
index b3292098..9f25e911 100644
--- a/other/travis/env-linux.sh
+++ b/other/travis/env-linux.sh
@@ -4,7 +4,6 @@ export PATH=/opt/ghc/7.8.4/bin:/opt/cabal/1.18/bin:/opt/alex/3.1.7/bin:/opt/happ
4export PATH=$HOME/.cabal/bin:$PATH 4export PATH=$HOME/.cabal/bin:$PATH
5 5
6CMAKE=cmake 6CMAKE=cmake
7CMAKE_EXTRA_FLAGS="$CMAKE_EXTRA_FLAGS -DFORMAT_TEST=ON"
8# Asan is disabled because it's currently broken on Travis. 7# Asan is disabled because it's currently broken on Travis.
9# See https://github.com/travis-ci/travis-ci/issues/9033. 8# See https://github.com/travis-ci/travis-ci/issues/9033.
10CMAKE_EXTRA_FLAGS="$CMAKE_EXTRA_FLAGS -DASAN=OFF" 9CMAKE_EXTRA_FLAGS="$CMAKE_EXTRA_FLAGS -DASAN=OFF"
diff --git a/other/travis/toxcore-script b/other/travis/toxcore-script
index 83ca8c04..1c6bea75 100755
--- a/other/travis/toxcore-script
+++ b/other/travis/toxcore-script
@@ -43,3 +43,5 @@ RUN $MAKE -C$BUILD_DIR -j$NPROC -k install
43if $RUN_TESTS; then 43if $RUN_TESTS; then
44 TESTS $MAX_TEST_RETRIES $MAKE -C$BUILD_DIR -j$NPROC test ARGS="-j50 --rerun-failed" CTEST_OUTPUT_ON_FAILURE="$CTEST_OUTPUT_ON_FAILURE" 44 TESTS $MAX_TEST_RETRIES $MAKE -C$BUILD_DIR -j$NPROC test ARGS="-j50 --rerun-failed" CTEST_OUTPUT_ON_FAILURE="$CTEST_OUTPUT_ON_FAILURE"
45fi 45fi
46
47other/astyle/format-source . $ASTYLE