summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorPeter Powell <petpow@saberuk.com>2019-12-06 19:33:55 +0000
committerPeter Powell <petpow@saberuk.com>2019-12-06 19:33:55 +0000
commitbd04209104e69bdbc33087889210cbd58c44286f (patch)
tree5d077fa6c0d85ccd5eb95d95069f994b378679b6 /tools
parentaea5500b46890665ccb26d436217cb7014e93a32 (diff)
Get rid of the platform tests in the Travis build script.
We only build on Xenial nowadays so this check is unnecessary.
Diffstat (limited to 'tools')
-rwxr-xr-xtools/travis-ci.sh12
1 files changed, 3 insertions, 9 deletions
diff --git a/tools/travis-ci.sh b/tools/travis-ci.sh
index ad5d98e4e..176cd3375 100755
--- 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 libmbedtls-dev libmysqlclient-dev libpcre3-dev libpq-dev libre2-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_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"
+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