summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml40
-rwxr-xr-xtools/ci/travis.sh5
2 files changed, 42 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 28f4387a6..a5430dbce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,9 +4,6 @@ addons:
apt:
sources:
- ubuntu-toolchain-r-test
- packages:
- - gcc-5
- - gcc-6
install:
- ./tools/ci/travis.sh getplugins || true
@@ -18,6 +15,7 @@ before_script:
- mysql -u root -e "SET PASSWORD FOR 'travis'@'localhost' = PASSWORD('travis');"
script:
+ - if [[ ! -z "${HPM}" ]]; then ./tools/ci/travis.sh buildhpm $CONFIGURE_FLAGS; fi
- ./tools/ci/travis.sh build $CONFIGURE_FLAGS
- ./tools/ci/travis.sh test ragnarok travis travis
@@ -31,6 +29,18 @@ matrix:
exclude:
- env: ignore=this
include:
+ - compiler: gcc
+ env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug CC=gcc-6 --disable-manager --enable-Werror --enable-buildbot" HPM="1"
+ addons:
+ apt:
+ sources:
+ - ubuntu-toolchain-r-test
+ packages:
+ - gcc-6
+ - doxygen
+ - libxml-simple-perl
+ - libxml-sax-perl
+ - libxml-parser-perl
- compiler: clang
env: CONFIGURE_FLAGS="--enable-debug --enable-Werror --enable-buildbot"
- compiler: clang
@@ -41,12 +51,36 @@ matrix:
env: CONFIGURE_FLAGS="--enable-debug --disable-renewal --enable-Werror --enable-buildbot"
- compiler: gcc
env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug --enable-sanitize=full CC=gcc-5 --disable-manager --enable-Werror --enable-buildbot"
+ addons:
+ apt:
+ sources:
+ - ubuntu-toolchain-r-test
+ packages:
+ - gcc-5
- compiler: gcc
env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug --enable-sanitize=full CC=gcc-5 --disable-manager --disable-renewal --enable-Werror --enable-buildbot"
+ addons:
+ apt:
+ sources:
+ - ubuntu-toolchain-r-test
+ packages:
+ - gcc-5
- compiler: gcc
env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug --enable-sanitize=full CC=gcc-6 --disable-manager --enable-Werror --enable-buildbot"
+ addons:
+ apt:
+ sources:
+ - ubuntu-toolchain-r-test
+ packages:
+ - gcc-6
- compiler: gcc
env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug --enable-sanitize=full CC=gcc-6 --disable-manager --disable-renewal --enable-Werror --enable-buildbot"
+ addons:
+ apt:
+ sources:
+ - ubuntu-toolchain-r-test
+ packages:
+ - gcc-6
notifications:
email: false
diff --git a/tools/ci/travis.sh b/tools/ci/travis.sh
index 4ba7e94b5..633248a1a 100755
--- a/tools/ci/travis.sh
+++ b/tools/ci/travis.sh
@@ -125,6 +125,11 @@ case "$MODE" in
make plugin.script_mapquit -j3 || aborterror "Build failed."
make test || aborterror "Build failed."
;;
+ buildhpm)
+ ./configure $@ || (cat config.log && aborterror "Configure error, aborting build.")
+ cd tools/HPMHookGen
+ make
+ ;;
test)
cat > conf/travis_sql_connection.conf << EOF
sql_connection: {