From 12711e108da06db66566bbdaaf2ec5d5a6363f33 Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Tue, 22 Aug 2017 09:09:04 +0300 Subject: [PATCH] Travis CI: Test some --enable-munmap configurations with disable incremental collection (Cherry-pick commit 4abb9eb from 'master' branch.) --- .travis.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 920b5e18..951f0877 100644 --- a/.travis.yml +++ b/.travis.yml @@ -113,7 +113,7 @@ matrix: - NO_CLONE_LIBATOMIC_OPS=true - os: osx env: - - CFLAGS_EXTRA="-march=native -D _FORTIFY_SOURCE=2 -D AO_DISABLE_GCC_ATOMICS" + - CFLAGS_EXTRA="-march=native -D _FORTIFY_SOURCE=2 -D AO_DISABLE_GCC_ATOMICS -D NO_INCREMENTAL" - CONF_OPTIONS="--with-libatomic-ops=no --enable-munmap --enable-cplusplus" - os: linux compiler: gcc @@ -153,6 +153,7 @@ matrix: compiler: gcc env: - CONF_OPTIONS="--enable-gcov --enable-handle-fork --enable-munmap --enable-single-obj-compilation --enable-cplusplus --disable-shared --enable-gc-assertions" + - CFLAGS_EXTRA="-D NO_INCREMENTAL" - REPORT_COVERAGE=true - os: linux compiler: gcc @@ -293,7 +294,7 @@ matrix: dist: trusty language: c env: - - CFLAGS_EXTRA="-fsanitize=memory -fno-omit-frame-pointer" + - CFLAGS_EXTRA="-fsanitize=memory -fno-omit-frame-pointer -D NO_INCREMENTAL" - CONF_OPTIONS="--enable-handle-fork --enable-munmap" - MSAN_OR_UBSAN=true sudo: required @@ -329,7 +330,7 @@ matrix: dist: trusty language: c env: - - CFLAGS_EXTRA="-m32 -D _FORTIFY_SOURCE=2" + - CFLAGS_EXTRA="-m32 -D _FORTIFY_SOURCE=2 -D GC_DISABLE_INCREMENTAL" - CONF_OPTIONS="--enable-munmap --enable-gc-assertions" - os: linux addons: @@ -373,7 +374,7 @@ matrix: dist: trusty language: c env: - - CFLAGS_EXTRA="-mx32 -march=native -D _FORTIFY_SOURCE=2" + - CFLAGS_EXTRA="-mx32 -march=native -D _FORTIFY_SOURCE=2 -D NO_INCREMENTAL" - CONF_OPTIONS="--enable-munmap --enable-large-config --enable-gc-assertions" - os: linux addons: -- 2.40.0