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

diff --git a/.travis.yml b/.travis.yml
index 8d136ed..c900ff3 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -118,7 +118,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 --enable-static"
   - os: linux
     compiler: gcc
@@ -174,6 +174,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
@@ -317,7 +318,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 --enable-static"
     - MSAN_OR_UBSAN=true
     - NO_CLONE_LIBATOMIC_OPS=true
@@ -356,7 +357,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"
     - NO_CLONE_LIBATOMIC_OPS=true
   - os: linux
@@ -403,7 +404,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"
     - NO_CLONE_LIBATOMIC_OPS=true
   - os: linux