summaryrefslogtreecommitdiff
path: root/other
diff options
context:
space:
mode:
Diffstat (limited to 'other')
-rw-r--r--other/travis/env.sh1
-rwxr-xr-xother/travis/toxcore-script1
2 files changed, 2 insertions, 0 deletions
diff --git a/other/travis/env.sh b/other/travis/env.sh
index f4ef8ef3..7d90d395 100644
--- a/other/travis/env.sh
+++ b/other/travis/env.sh
@@ -7,6 +7,7 @@ export LD_LIBRARY_PATH=$CACHE_DIR/lib
7export PKG_CONFIG_PATH=$CACHE_DIR/lib/pkgconfig 7export PKG_CONFIG_PATH=$CACHE_DIR/lib/pkgconfig
8export ASTYLE=$CACHE_DIR/astyle/build/gcc/bin/astyle 8export ASTYLE=$CACHE_DIR/astyle/build/gcc/bin/astyle
9export CFLAGS="-O3 -DTRAVIS_ENV=1" 9export CFLAGS="-O3 -DTRAVIS_ENV=1"
10export CXXFLAGS="-O3 -DTRAVIS_ENV=1"
10export CMAKE_EXTRA_FLAGS="-DERROR_ON_WARNING=ON" 11export CMAKE_EXTRA_FLAGS="-DERROR_ON_WARNING=ON"
11export MAKE=make 12export MAKE=make
12 13
diff --git a/other/travis/toxcore-script b/other/travis/toxcore-script
index 763be2e4..82c39ce9 100755
--- a/other/travis/toxcore-script
+++ b/other/travis/toxcore-script
@@ -2,6 +2,7 @@
2 2
3# Enable test coverage recording. 3# Enable test coverage recording.
4export CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage" 4export CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
5export CXXFLAGS="$CXXFLAGS -fprofile-arcs -ftest-coverage"
5 6
6set_opt() { 7set_opt() {
7 opts="$opts -D$1="`expr ON \& \( $i % 2 \) \| OFF` 8 opts="$opts -D$1="`expr ON \& \( $i % 2 \) \| OFF`