Travis CI: Test some --enable-munmap configurations with disable incremental collection

(Cherry-pick commit 4abb9eb from 'master' branch.)

diff --git a/.travis.yml b/.travis.yml
index 920b5e1845bd3b271cf5bb038326fe3a34278e8b..951f08772c06aa9f7ebc45d79911397cfa257cf0 100644 (file)
--- 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: