Travis CI: Test MARK_BIT_PER_OBJ and SMALL_CONFIG in separate builds

(fix commit 817ea6f)

Perform MARK_BIT_PER_OBJ testing only in 32-bit mode (for now).
Also test -D NO_GETENV.

diff --git a/.travis.yml b/.travis.yml
index fae1420267bd26374a7a193ee3e8fd8b57b5f7e1..8a3d98ab1f9ad09f11d8847e7a4ba60558e85127 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,8 +13,9 @@ env:
   - CFLAGS_EXTRA_M=-m32 CONF_ASSERTIONS=--enable-gc-assertions
   - CFLAGS_EXTRA="-D CHECKSUMS" CONF_THREADS=--disable-threads
   - CFLAGS_EXTRA="-D GC_BUILTIN_ATOMIC -march=native"
+  - CFLAGS_EXTRA="-D MARK_BIT_PER_OBJ" CFLAGS_EXTRA_M=-m32
   - CFLAGS_EXTRA="-D PROC_VDB -D GC_NO_SYS_FAULT_H -D NO_INCREMENTAL"
-  - CFLAGS_EXTRA="-D SMALL_CONFIG -D MARK_BIT_PER_OBJ"
+  - CFLAGS_EXTRA="-D SMALL_CONFIG -D NO_GETENV"
   - CONF_GCOV=--enable-gcov
   - CONF_GC_DEBUG=--enable-gc-debug
   - CONF_GC_DEBUG=--disable-gc-debug
@@ -37,10 +38,12 @@ matrix:
     env: CFLAGS_EXTRA="-D CHECKSUMS" CONF_THREADS=--disable-threads
   - compiler: gcc
     env: CFLAGS_EXTRA="-D GC_BUILTIN_ATOMIC -march=native"
+  - compiler: clang
+    env: CFLAGS_EXTRA="-D MARK_BIT_PER_OBJ" CFLAGS_EXTRA_M=-m32
   - compiler: clang
     env: CFLAGS_EXTRA="-D PROC_VDB -D GC_NO_SYS_FAULT_H -D NO_INCREMENTAL"
   - compiler: clang
-    env: CFLAGS_EXTRA="-D SMALL_CONFIG -D MARK_BIT_PER_OBJ"
+    env: CFLAGS_EXTRA="-D SMALL_CONFIG -D NO_GETENV"
   - compiler: clang
     env: CONF_GCOV=--enable-gcov
   - compiler: clang