Improve stability of crypto_memcmp test.

Also reduce number of people in conference to 5, because on Circle CI the
test times out trying to connect more than 6 or 7 people. The persistent
conferences PR will improve this so we can set it much higher then.

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
 export PKG_CONFIG_PATH=$CACHE_DIR/lib/pkgconfig
 export ASTYLE=$CACHE_DIR/astyle/build/gcc/bin/astyle
 export CFLAGS="-O3 -DTRAVIS_ENV=1"
+export CXXFLAGS="-O3 -DTRAVIS_ENV=1"
 export CMAKE_EXTRA_FLAGS="-DERROR_ON_WARNING=ON"
 export MAKE=make
 
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 @@
 
 # Enable test coverage recording.
 export CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
+export CXXFLAGS="$CXXFLAGS -fprofile-arcs -ftest-coverage"
 
 set_opt() {
   opts="$opts -D$1="`expr ON \& \( $i % 2 \) \| OFF`