Convert InspIRCd::SetSignals to a static function.

[user/henk/code/inspircd.git] / tools / travis-ci.sh

diff --git a/tools/travis-ci.sh b/tools/travis-ci.sh
index 8069717f0c00da6d510ca304477a2b748d72b7c7..176cd33752735c358a633ff01a950398c4bcb206 100755 (executable)
--- a/tools/travis-ci.sh
+++ b/tools/travis-ci.sh
@@ -1,12 +1,6 @@
 #!/bin/bash
 set -ev
-if [ "$TRAVIS_OS_NAME" = "linux" ]
-then
-       sudo apt-get update --assume-yes
-       sudo apt-get install --assume-yes libgnutls-dev libldap2-dev libmaxminddb-dev libmysqlclient-dev libpcre3-dev libpq-dev libsqlite3-dev libssl-dev libtre-dev
-else
-       >&2 echo "'$TRAVIS_OS_NAME' is an unknown Travis CI environment!"
-       exit 1
-fi
-export TEST_BUILD_MODULES="m_geo_maxmind.cpp,m_ldap.cpp,m_mysql.cpp,m_pgsql.cpp,m_regex_pcre.cpp,m_regex_posix.cpp,m_regex_tre.cpp,m_sqlite3.cpp,m_ssl_gnutls.cpp,m_ssl_openssl.cpp"
+sudo apt-get update --assume-yes
+sudo apt-get install --assume-yes --no-install-recommends libgnutls-dev libldap2-dev libmaxminddb-dev libmbedtls-dev libmysqlclient-dev libpcre3-dev libpq-dev libre2-dev libsqlite3-dev libssl-dev libtre-dev
+TEST_BUILD_MODULES="m_geo_maxmind.cpp,m_ldap.cpp,m_mysql.cpp,m_pgsql.cpp,m_regex_pcre.cpp,m_regex_posix.cpp,m_regex_re2.cpp,m_regex_stdlib.cpp,m_regex_tre.cpp,m_sqlite3.cpp,m_ssl_gnutls.cpp,m_ssl_mbedtls.cpp,m_ssl_openssl.cpp,m_sslrehashsignal.cpp"
 ./tools/test-build $CXX