From: Ivan Maidanski <ivmai@mail.ru>
Date: Sun, 9 Apr 2017 14:42:40 +0000 (+0300)
Subject: Travis CI: Replace multiple CONF_x with a single CONF_OPTIONS variable
X-Git-Tag: v7.4.6~124
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=de9fe2263e8e0e2205ab2e53fad5b5348e22a3b1;p=gc

Travis CI: Replace multiple CONF_x with a single CONF_OPTIONS variable
(Cherry-pick commit 0138d60 from 'master' branch.)
---

diff --git a/.travis.yml b/.travis.yml
index 4d72345e..f4f562b6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,71 +4,56 @@ matrix:
   include:
     - os: linux
       compiler: clang
-      env: [ CONF_CPP=--enable-cplusplus ]
+      env: [ CONF_OPTIONS="--enable-cplusplus" ]
     - os: linux
       compiler: gcc
-      env: [ CONF_CPP=--enable-cplusplus ]
+      env: [ CONF_OPTIONS="--enable-cplusplus" ]
     - os: osx
-      env: [ CONF_CPP=--enable-cplusplus ]
+      env: [ CONF_OPTIONS="--enable-cplusplus" ]
     - os: linux
       addons: { apt: { packages: [ gcc-multilib ] } }
       compiler: clang
-      env: [ CFLAGS_EXTRA="-m32", CONF_ASSERTIONS=--enable-gc-assertions ]
+      env: [ CFLAGS_EXTRA="-m32", CONF_OPTIONS="--enable-gc-assertions" ]
     - os: linux
       addons: { apt: { packages: [ gcc-multilib ] } }
       compiler: gcc
-      env: [ CFLAGS_EXTRA="-m32", CONF_ASSERTIONS=--enable-gc-assertions ]
+      env: [ CFLAGS_EXTRA="-m32", CONF_OPTIONS="--enable-gc-assertions" ]
     - os: osx
       env:
         - CFLAGS_EXTRA="-m32"
-        - CONF_ASSERTIONS=--enable-gc-assertions
-        - CONF_CPP=--enable-cplusplus
+        - CONF_OPTIONS="--enable-gc-assertions --enable-cplusplus"
     - os: linux
       compiler: gcc
-      env: [ CONF_GC_DEBUG=--enable-gc-debug, CONF_CPP=--enable-cplusplus ]
+      env: [ CONF_OPTIONS="--enable-gc-debug --enable-cplusplus" ]
     - os: linux
       compiler: gcc
-      env: [ CONF_GC_DEBUG=--disable-gc-debug, CONF_CPP=--enable-cplusplus ]
+      env: [ CONF_OPTIONS="--disable-gc-debug --enable-cplusplus" ]
     - os: linux
       compiler: clang
       env:
-        - CONF_LARGE_CONFIG=--enable-large-config
-        - CONF_M_UNMAP=--enable-munmap
-        - CONF_CPP=--enable-cplusplus
+        - CONF_OPTIONS="--enable-large-config --enable-munmap --enable-cplusplus"
     - os: osx
       env:
-        - CONF_LARGE_CONFIG=--enable-large-config
-        - CONF_M_UNMAP=--enable-munmap
-        - CONF_CPP=--enable-cplusplus
+        - CONF_OPTIONS="--enable-large-config --enable-munmap --enable-cplusplus"
     - os: linux
       compiler: clang
       env:
-        - CONF_STATIC=--disable-static
-        - CONF_THREADS=--disable-threads
+        - CONF_OPTIONS="--disable-static --disable-threads --enable-gc-assertions --enable-cplusplus"
         - CFLAGS_EXTRA="-O3 -march=native"
-        - CONF_ASSERTIONS=--enable-gc-assertions
-        - CONF_CPP=--enable-cplusplus
     - os: linux
       compiler: gcc
       env:
-        - CONF_STATIC=--disable-static
-        - CONF_THREADS=--disable-threads
+        - CONF_OPTIONS="--disable-static --disable-threads --enable-gc-assertions --enable-cplusplus"
         - CFLAGS_EXTRA="-O3 -march=native"
-        - CONF_ASSERTIONS=--enable-gc-assertions
-        - CONF_CPP=--enable-cplusplus
     - os: osx
       env:
-        - CONF_STATIC=--disable-static
-        - CONF_THREADS=--disable-threads
+        - CONF_OPTIONS="--disable-static --disable-threads --enable-gc-assertions --enable-cplusplus"
         - CFLAGS_EXTRA="-O3 -march=native"
-        - CONF_ASSERTIONS=--enable-gc-assertions
-        - CONF_CPP=--enable-cplusplus
 
 install:
   - git clone --depth=50 https://github.com/ivmai/libatomic_ops.git -b release-7_4
   - ./autogen.sh
 
 script:
-  - ./configure $CONF_ASSERTIONS $CONF_CPP $CONF_GC_DEBUG $CONF_LARGE_CONFIG
-                $CONF_M_UNMAP $CONF_STATIC $CONF_THREADS
+  - ./configure $CONF_OPTIONS
   - make -j check CFLAGS_EXTRA="$CFLAGS_EXTRA"