summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Biro <nurupo.contributions@gmail.com>2016-10-04 15:28:26 -0400
committerMaxim Biro <nurupo.contributions@gmail.com>2016-10-04 15:32:38 -0400
commitbf42872bb3b1078deb7955f6b6044cd919565c31 (patch)
treee7786bd2498c1625f4bda70100131b1b4cd1c1db
parentac8fb636a13b22a038b2d9e9805711898125804b (diff)
Use TEST_TIMEOUT_SECONDS cmake flag on Travis
-rwxr-xr-xother/travis/toxcore-script9
1 files changed, 8 insertions, 1 deletions
diff --git a/other/travis/toxcore-script b/other/travis/toxcore-script
index b1e60763..c5d94ba2 100755
--- a/other/travis/toxcore-script
+++ b/other/travis/toxcore-script
@@ -6,7 +6,14 @@ export CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
6# Build toxcore and run tests. 6# Build toxcore and run tests.
7# TODO(iphydf): Enable ASAN. It currently has some bad interactions with gcov, 7# TODO(iphydf): Enable ASAN. It currently has some bad interactions with gcov,
8# so it's disabled on Travis. 8# so it's disabled on Travis.
9RUN $CMAKE -B$BUILD_DIR -H. -DCMAKE_INSTALL_PREFIX:PATH=$CURDIR/_install -DDEBUG=ON -DASSOC_DHT=ON -DSTRICT_ABI=ON #-DASAN=ON 9RUN $CMAKE \
10 -B$BUILD_DIR \
11 -H. \
12 -DCMAKE_INSTALL_PREFIX:PATH=$CURDIR/_install \
13 -DDEBUG=ON \
14 -DASSOC_DHT=ON \
15 -DSTRICT_ABI=ON \
16 -DTEST_TIMEOUT_SECONDS=300 #-DASAN=ON
10 17
11export CTEST_OUTPUT_ON_FAILURE=1 18export CTEST_OUTPUT_ON_FAILURE=1
12 19