Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ install:
../configure --disable-fastopen --build `../config.guess` --host aarch64-linux-gnu CC="gcc -B$HOME/linker_bin" CXX="g++ -B$HOME/linker_bin";
elif [ "$CROSS_COMPILE" = "1" ] && [ "$ARM_ARCH_DIR" = "arm-linux-gnueabi" ]; then
../configure --disable-fastopen --build `../config.guess` --host arm-linux-gnueabi;
elif [ "$VALGRIND" = "valgrind" ]; then
../configure --enable-debug --disable-fastopen --disable-valgrind-helgrind --disable-valgrind-drd --disable-valgrind-sgcheck;
else
../configure --disable-fastopen;
fi
Expand Down Expand Up @@ -85,6 +87,8 @@ script:
fi
- make check
- cat test/test-suite.log
- if [ "$VALGRIND" = "valgrind" ]; then make check-valgrind; fi;
- if [ "$VALGRIND" = "valgrind" ]; then cat test/test-suite-memcheck.log; fi;
- ls -l /usr/local/lib/
- ls -l /usr/lib/
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then cd ../src/; cppcheck --error-exitcode=1 .; cd ../build; fi
Expand Down Expand Up @@ -178,6 +182,17 @@ matrix:
- g++-8
env:
- MATRIX_EVAL="CC=gcc-8 && CXX=g++-8"
- os: linux
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-7
- valgrind
- valgrind-dbg
env:
- MATRIX_EVAL="CC=gcc-7 && CXX=g++-7 && VALGRIND=valgrind"
#- os: osx
# osx_image: xcode8
# env:
Expand Down
1 change: 1 addition & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,7 @@ AC_CONFIG_LINKS([test/test_content:test/test_content])
AC_CONFIG_LINKS([test/cert.pem:test/cert.pem])
AC_CONFIG_LINKS([test/key.pem:test/key.pem])
AC_CONFIG_LINKS([test/test_root_ca.pem:test/test_root_ca.pem])
AC_CONFIG_LINKS([test/libhttpserver.supp:test/libhttpserver.supp])
AC_CONFIG_LINKS([examples/cert.pem:examples/cert.pem])
AC_CONFIG_LINKS([examples/key.pem:examples/key.pem])
AC_CONFIG_LINKS([examples/test_content:examples/test_content])
Expand Down
4 changes: 2 additions & 2 deletions test/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,5 @@ endif
TESTS = $(check_PROGRAMS)

@VALGRIND_CHECK_RULES@
#VALGRIND_SUPPRESSIONS_FILES = libhttpserver.supp
#EXTRA_DIST = libhttpserver.supp
VALGRIND_SUPPRESSIONS_FILES = libhttpserver.supp
EXTRA_DIST = libhttpserver.supp
1 change: 1 addition & 0 deletions test/integ/ws_start_stop.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,7 @@ LT_BEGIN_AUTO_TEST(ws_start_stop_suite, ssl_base)
LT_ASSERT_EQ(res, 0);
LT_CHECK_EQ(s, "OK");
curl_easy_cleanup(curl);
curl_global_cleanup();

ws.stop();
LT_END_AUTO_TEST(ssl_base)
Expand Down
5 changes: 5 additions & 0 deletions test/libhttpserver.supp
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
gnutls_session_get_data
Memcheck:Cond
fun:gnutls_session_get_data
}