]> granicus.if.org Git - gc/commitdiff
Travis CI: Remove -D NO_INCREMENTAL if --enable-munmap
authorIvan Maidanski <ivmai@mail.ru>
Wed, 29 Nov 2017 08:12:20 +0000 (11:12 +0300)
committerIvan Maidanski <ivmai@mail.ru>
Wed, 29 Nov 2017 14:13:28 +0000 (17:13 +0300)
The incremental mode is disabled in gctest automatically now
if compiled with memory unmapping support.

.travis.yml

index c1a165a916d90b7f47322a8ea8f4192f45e94e92..fadca8187c06285966736148334eb198add8b2a3 100644 (file)
@@ -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 -D NO_INCREMENTAL"
+    - CFLAGS_EXTRA="-march=native -D _FORTIFY_SOURCE=2 -D AO_DISABLE_GCC_ATOMICS"
     - CONF_OPTIONS="--with-libatomic-ops=no --enable-munmap --enable-cplusplus --enable-static"
   - os: linux
     compiler: gcc
@@ -174,7 +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 -D USE_CUSTOM_SPECIFIC"
+    - CFLAGS_EXTRA="-D USE_CUSTOM_SPECIFIC"
     - REPORT_COVERAGE=true
   - os: linux
     compiler: gcc
@@ -339,7 +339,7 @@ matrix:
     dist: trusty
     language: c
     env:
-    - CFLAGS_EXTRA="-fsanitize=memory -fno-omit-frame-pointer -D NO_INCREMENTAL"
+    - CFLAGS_EXTRA="-fsanitize=memory -fno-omit-frame-pointer"
     - CONF_OPTIONS="--enable-handle-fork --enable-munmap --enable-static"
     - TESTS_CUSTOM_RUN=true
     - NO_CLONE_LIBATOMIC_OPS=true
@@ -425,7 +425,7 @@ matrix:
     dist: trusty
     language: c
     env:
-    - CFLAGS_EXTRA="-mx32 -march=native -D _FORTIFY_SOURCE=2 -D NO_INCREMENTAL"
+    - CFLAGS_EXTRA="-mx32 -march=native -D _FORTIFY_SOURCE=2"
     - CONF_OPTIONS="--enable-munmap --enable-large-config --enable-gc-assertions"
     - NO_CLONE_LIBATOMIC_OPS=true
   - os: linux