diff options
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index fee8b49d0..cf95cd667 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,7 @@ compiler: - gcc env: + - BUILD=yes TEST=test COVERAGE=no FEATURES=tiny "CONFOPT='--disable-gui'" SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no - BUILD=yes TEST=test COVERAGE=no FEATURES=tiny CONFOPT= SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no # ASAN build - BUILD=yes TEST=test SANITIZER_CFLAGS="-g -O1 -DABORT_ON_INTERNAL_ERROR -DEXITFREE -fsanitize=address -fno-omit-frame-pointer" @@ -28,10 +29,13 @@ sudo: false # instead of a 2*2*7 matrix (2*os + 2*compiler + 7*env), # exclude some builds on mac os x and linux +# on mac os x "tiny" is always without GUI # linux: 2*compiler + 5*env + mac: 2*compiler + 2*env matrix: exclude: - os: osx + env: BUILD=yes TEST=test COVERAGE=no FEATURES=tiny CONFOPT= SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no + - os: osx env: BUILD=yes TEST=test COVERAGE=no FEATURES=normal CONFOPT= SHADOWOPT="-C src/shadow" SRCDIR=./src/shadow CHECK_AUTOCONF=no - os: osx env: BUILD=no TEST=unittests COVERAGE=yes CFLAGS=--coverage LDFLAGS=--coverage FEATURES=huge SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=yes diff --git a/src/version.c b/src/version.c index 8584fceee..da4b2b6f3 100644 --- a/src/version.c +++ b/src/version.c @@ -792,6 +792,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 776, +/**/ 775, /**/ 774, |